[webkit-changes] [110486] trunk/Source/WebKit/chromium

[abarth]

Title: [110486] trunk/Source/WebKit/chromium

Revision

110486

Author

aba...@webkit.org

Date

2012-03-12 14:59:55 -0700 (Mon, 12 Mar 2012)

Log Message

[chromium] Fix clang build for CCOcclusionTracker tests
https://bugs.webkit.org/show_bug.cgi?id=80891

Patch by Dana Jansens <dan...@chromium.org> on 2012-03-12
Reviewed by Adam Barth.

* tests/CCOcclusionTrackerTest.cpp:
(WebCore::CCOcclusionTrackerTest::createRoot):
(WebCore::CCOcclusionTrackerTest::createLayer):
(WebCore::CCOcclusionTrackerTest::createDrawingLayer):

Modified Paths

• trunk/Source/WebKit/chromium/ChangeLog
• trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (110485 => 110486)

--- trunk/Source/WebKit/chromium/ChangeLog	2012-03-12 21:59:15 UTC (rev 110485)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-03-12 21:59:55 UTC (rev 110486)
@@ -1,3 +1,15 @@
+2012-03-12  Dana Jansens  <dan...@chromium.org>
+
+        [chromium] Fix clang build for CCOcclusionTracker tests
+        https://bugs.webkit.org/show_bug.cgi?id=80891
+
+        Reviewed by Adam Barth.
+
+        * tests/CCOcclusionTrackerTest.cpp:
+        (WebCore::CCOcclusionTrackerTest::createRoot):
+        (WebCore::CCOcclusionTrackerTest::createLayer):
+        (WebCore::CCOcclusionTrackerTest::createDrawingLayer):
+
 2012-03-12  Stephen White  <senorbla...@chromium.org>
 
         [chromium] Restore canvas2D acceleration after context loss.

Modified: trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp (110485 => 110486)

--- trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp	2012-03-12 21:59:15 UTC (rev 110485)
+++ trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp	2012-03-12 21:59:55 UTC (rev 110486)
@@ -161,7 +161,7 @@
 
     typename Types::ContentLayerType* createRoot(const TransformationMatrix& transform, const FloatPoint& position, const IntSize& bounds)
     {
-        typename Types::ContentLayerPtrType layer = Types::createContentLayer();
+        typename Types::ContentLayerPtrType layer(Types::createContentLayer());
         typename Types::ContentLayerType* layerPtr = layer.get();
         setProperties(layerPtr, transform, position, bounds);
 
@@ -172,7 +172,7 @@
 
     typename Types::LayerType* createLayer(typename Types::LayerType* parent, const TransformationMatrix& transform, const FloatPoint& position, const IntSize& bounds)
     {
-        typename Types::LayerPtrType layer = Types::createLayer();
+        typename Types::LayerPtrType layer(Types::createLayer());
         typename Types::LayerType* layerPtr = layer.get();
         setProperties(layerPtr, transform, position, bounds);
         parent->addChild(layer.release());
@@ -190,7 +190,7 @@
 
     typename Types::ContentLayerType* createDrawingLayer(typename Types::LayerType* parent, const TransformationMatrix& transform, const FloatPoint& position, const IntSize& bounds, bool opaque)
     {
-        typename Types::ContentLayerPtrType layer = Types::createContentLayer();
+        typename Types::ContentLayerPtrType layer(Types::createContentLayer());
         typename Types::ContentLayerType* layerPtr = layer.get();
         setProperties(layerPtr, transform, position, bounds);
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes