2011-02-06 Ryosuke Niwa <rniwa@webkit.org>

        Unreviewed Chromium build fix.

        * DumpRenderTree/chromium/LayoutTestController.cpp:
        (LayoutTestController::pathToLocalResource):
2011-02-06  Ryosuke Niwa  <rniwa@webkit.org>

        Unreviewed; speculative Qt build fix.

        * WebKit2.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index dae327f56b4b5c08ceca5a33e5465aaa037d204e..7c06f4960e65cfe11f0469e518fd784366f1b31c 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed; speculative Qt build fix.
+
+        * WebKit2.pro:
+
 2011-02-06  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Darin Adler.

diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro
index ab93e8884cb2f75d50f0f36e8fa9f8fff35adb03..7138a4948668b6ee397b345dba4b9413f8d17249 100644 (file)
--- a/Source/WebKit2/WebKit2.pro
+++ b/Source/WebKit2/WebKit2.pro
@@ -691,3 +691,4 @@ SOURCES += \
     WebProcess/qt/WebProcessMainQt.cpp \
     WebProcess/qt/WebProcessQt.cpp \
     $$WEBKIT2_GENERATED_SOURCES
+

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a2f857d2624dfe835a2ee587989e6534b0aba613..eac7dd7fbd9131c5d07ac5f281eeda03e8c38d72 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed Chromium build fix.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::pathToLocalResource):
+
 2011-02-06  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Darin Adler.

diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
index 7c18da7964047d6a6c864c6e77609724151fd5ef..18a19c8da5da63a91c05580ec809000154f0b51e 100644 (file)
--- a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -799,7 +799,7 @@ void LayoutTestController::pathToLocalResource(const CppArgumentList& arguments,
         // We want a temp file.
         const unsigned tempPrefixLength = 5;
         size_t bufferSize = MAX_PATH;
-        OwnArrayPtr<WCHAR> tempPath(new WCHAR[bufferSize]);
+        OwnArrayPtr<WCHAR> tempPath = adoptArrayPtr(new WCHAR[bufferSize]);
         DWORD tempLength = ::GetTempPathW(bufferSize, tempPath.get());
         if (tempLength + url.length() - tempPrefixLength + 1 > bufferSize) {
             bufferSize = tempLength + url.length() - tempPrefixLength + 1;