Title: [113650] trunk/Source/WebKit/chromium
Revision
113650
Author
[email protected]
Date
2012-04-09 18:10:15 -0700 (Mon, 09 Apr 2012)

Log Message

[chromium] Unreviewed build fix. OwnPtr<>::operator = breaks the build on clang, but not gcc :(

* tests/CCLayerTreeHostTest.cpp:
(WTF::MockLayerTreeHost::create):
* tests/Canvas2DLayerChromiumTest.cpp:
* tests/LayerChromiumTest.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (113649 => 113650)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-04-10 01:02:22 UTC (rev 113649)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-04-10 01:10:15 UTC (rev 113650)
@@ -1,3 +1,12 @@
+2012-04-09  James Robinson  <[email protected]>
+
+        [chromium] Unreviewed build fix. OwnPtr<>::operator = breaks the build on clang, but not gcc :(
+
+        * tests/CCLayerTreeHostTest.cpp:
+        (WTF::MockLayerTreeHost::create):
+        * tests/Canvas2DLayerChromiumTest.cpp:
+        * tests/LayerChromiumTest.cpp:
+
 2012-04-09  Dana Jansens  <[email protected]>
 
         [chromium] Make culling work with clipped rects

Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (113649 => 113650)


--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp	2012-04-10 01:02:22 UTC (rev 113649)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp	2012-04-10 01:10:15 UTC (rev 113650)
@@ -138,7 +138,7 @@
         CCSettings settingsCopy = settings;
         settingsCopy.threadedAnimationEnabled = true;
 
-        OwnPtr<MockLayerTreeHost> layerTreeHost = adoptPtr(new MockLayerTreeHost(testHooks, client, settingsCopy));
+        OwnPtr<MockLayerTreeHost> layerTreeHost(adoptPtr(new MockLayerTreeHost(testHooks, client, settingsCopy)));
         bool success = layerTreeHost->initialize();
         EXPECT_TRUE(success);
         layerTreeHost->setRootLayer(rootLayer);

Modified: trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp (113649 => 113650)


--- trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp	2012-04-10 01:02:22 UTC (rev 113649)
+++ trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp	2012-04-10 01:10:15 UTC (rev 113650)
@@ -58,7 +58,7 @@
 public:
     static PassOwnPtr<FakeCCLayerTreeHost> create()
     {
-        OwnPtr<FakeCCLayerTreeHost> host = adoptPtr(new FakeCCLayerTreeHost);
+        OwnPtr<FakeCCLayerTreeHost> host(adoptPtr(new FakeCCLayerTreeHost));
         host->initialize();
         return host.release();
     }

Modified: trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp (113649 => 113650)


--- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp	2012-04-10 01:02:22 UTC (rev 113649)
+++ trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp	2012-04-10 01:10:15 UTC (rev 113650)
@@ -603,7 +603,7 @@
 public:
     static PassOwnPtr<FakeCCLayerTreeHost> create()
     {
-        OwnPtr<FakeCCLayerTreeHost> host = adoptPtr(new FakeCCLayerTreeHost);
+        OwnPtr<FakeCCLayerTreeHost> host(adoptPtr(new FakeCCLayerTreeHost));
         // The initialize call will fail, since our client doesn't provide a valid GraphicsContext3D, but it doesn't matter in the tests that use this fake so ignore the return value.
         host->initialize();
         return host.release();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to