Title: [113658] trunk/Source/WebKit/chromium
Revision
113658
Author
[email protected]
Date
2012-04-09 19:05:38 -0700 (Mon, 09 Apr 2012)

Log Message

[chromium] More unreviewed OwnPtr<>::operator= related clang build fixes in unit tests.

* tests/Canvas2DLayerChromiumTest.cpp:
* tests/LayerChromiumTest.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (113657 => 113658)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-04-10 01:53:54 UTC (rev 113657)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-04-10 02:05:38 UTC (rev 113658)
@@ -1,3 +1,10 @@
+2012-04-09  James Robinson  <[email protected]>
+
+        [chromium] More unreviewed OwnPtr<>::operator= related clang build fixes in unit tests.
+
+        * tests/Canvas2DLayerChromiumTest.cpp:
+        * tests/LayerChromiumTest.cpp:
+
 2012-04-09  Dana Jansens  <[email protected]>
 
         [chromium] Cull occluded surface quads

Modified: trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp (113657 => 113658)


--- trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp	2012-04-10 01:53:54 UTC (rev 113657)
+++ trunk/Source/WebKit/chromium/tests/Canvas2DLayerChromiumTest.cpp	2012-04-10 02:05:38 UTC (rev 113658)
@@ -111,7 +111,7 @@
            thread = adoptPtr(webKitPlatformSupport()->createThread("Canvas2DLayerChromiumTest"));
         WebCompositor::initialize(thread.get());
 
-        OwnPtr<FakeCCLayerTreeHost> layerTreeHost = FakeCCLayerTreeHost::create();
+        OwnPtr<FakeCCLayerTreeHost> layerTreeHost(FakeCCLayerTreeHost::create());
         // Force an update, so that we get a valid TextureManager.
         layerTreeHost->updateLayers();
 

Modified: trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp (113657 => 113658)


--- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp	2012-04-10 01:53:54 UTC (rev 113657)
+++ trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp	2012-04-10 02:05:38 UTC (rev 113658)
@@ -650,7 +650,7 @@
 
     assertLayerTreeHostMatchesForSubtree(parent.get(), 0);
 
-    OwnPtr<FakeCCLayerTreeHost> layerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> layerTreeHost(FakeCCLayerTreeHost::create());
     // Setting the root layer should set the host pointer for all layers in the tree.
     layerTreeHost->setRootLayer(parent.get());
 
@@ -669,7 +669,7 @@
 {
     WebKit::WebCompositor::initialize(0);
     RefPtr<LayerChromium> parent = LayerChromium::create();
-    OwnPtr<FakeCCLayerTreeHost> layerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> layerTreeHost(FakeCCLayerTreeHost::create());
 
     layerTreeHost->setRootLayer(parent.get());
 
@@ -711,14 +711,14 @@
     child->setReplicaLayer(replica.get());
     replica->setMaskLayer(mask.get());
 
-    OwnPtr<FakeCCLayerTreeHost> firstLayerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> firstLayerTreeHost(FakeCCLayerTreeHost::create());
     firstLayerTreeHost->setRootLayer(parent.get());
 
     assertLayerTreeHostMatchesForSubtree(parent.get(), firstLayerTreeHost.get());
 
     // Now re-root the tree to a new host (simulating what we do on a context lost event).
     // This should update the host pointers for all layers in the tree.
-    OwnPtr<FakeCCLayerTreeHost> secondLayerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> secondLayerTreeHost(FakeCCLayerTreeHost::create());
     secondLayerTreeHost->setRootLayer(parent.get());
 
     assertLayerTreeHostMatchesForSubtree(parent.get(), secondLayerTreeHost.get());
@@ -743,13 +743,13 @@
     secondChild->addChild(secondGrandChild);
     firstParent->addChild(secondChild);
 
-    OwnPtr<FakeCCLayerTreeHost> firstLayerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> firstLayerTreeHost(FakeCCLayerTreeHost::create());
     firstLayerTreeHost->setRootLayer(firstParent.get());
 
     assertLayerTreeHostMatchesForSubtree(firstParent.get(), firstLayerTreeHost.get());
 
     // Now reparent the subtree starting at secondChild to a layer in a different tree.
-    OwnPtr<FakeCCLayerTreeHost> secondLayerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> secondLayerTreeHost(FakeCCLayerTreeHost::create());
     secondLayerTreeHost->setRootLayer(secondParent.get());
 
     secondParent->addChild(secondChild);
@@ -782,7 +782,7 @@
     mask->addChild(maskChild);
     replica->addChild(replicaChild);
 
-    OwnPtr<FakeCCLayerTreeHost> layerTreeHost = FakeCCLayerTreeHost::create();
+    OwnPtr<FakeCCLayerTreeHost> layerTreeHost(FakeCCLayerTreeHost::create());
     layerTreeHost->setRootLayer(parent.get());
 
     assertLayerTreeHostMatchesForSubtree(parent.get(), layerTreeHost.get());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to