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

Thu, 15 Mar 2012 23:19:00 -0700

Title: [110949] trunk/Source/WebKit/chromium
Revision
110949
Author
[email protected]
Date
2012-03-15 23:18:45 -0700 (Thu, 15 Mar 2012)

Log Message

[chromium] Fix some assertions in occlusion tracker unit tests
https://bugs.webkit.org/show_bug.cgi?id=81308

Patch by Dana Jansens <[email protected]> on 2012-03-15
Reviewed by James Robinson.

* tests/CCOcclusionTrackerTest.cpp:
(WebCore::CCOcclusionTrackerTestSurfaceRotatedOffAxis::runMyTest):
(WebCore::CCOcclusionTrackerTestDamageRectOutsideChild::runMyTest):
(WebCore::CCOcclusionTrackerTest3dTransform::runMyTest):
(WebCore::CCOcclusionTrackerTestPerspectiveTransform::runMyTest):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (110948 => 110949)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-03-16 06:18:37 UTC (rev 110948)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-03-16 06:18:45 UTC (rev 110949)
@@ -1,3 +1,16 @@
+2012-03-15  Dana Jansens  <[email protected]>
+
+        [chromium] Fix some assertions in occlusion tracker unit tests
+        https://bugs.webkit.org/show_bug.cgi?id=81308
+
+        Reviewed by James Robinson.
+
+        * tests/CCOcclusionTrackerTest.cpp:
+        (WebCore::CCOcclusionTrackerTestSurfaceRotatedOffAxis::runMyTest):
+        (WebCore::CCOcclusionTrackerTestDamageRectOutsideChild::runMyTest):
+        (WebCore::CCOcclusionTrackerTest3dTransform::runMyTest):
+        (WebCore::CCOcclusionTrackerTestPerspectiveTransform::runMyTest):
+
 2012-03-15  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r110941.

Modified: trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp (110948 => 110949)


--- trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp	2012-03-16 06:18:37 UTC (rev 110948)
+++ trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp	2012-03-16 06:18:45 UTC (rev 110949)
@@ -756,22 +756,22 @@
         EXPECT_EQ(1u, occlusion.occlusionInTargetSurface().rects().size());
 
         EXPECT_TRUE(occlusion.occluded(child, clippedLayerInChild));
-        EXPECT_TRUE(occlusion.unoccludedContentRect(parent, clippedLayerInChild).isEmpty());
+        EXPECT_TRUE(occlusion.unoccludedContentRect(child, clippedLayerInChild).isEmpty());
         clippedLayerInChild.move(-1, 0);
         EXPECT_FALSE(occlusion.occluded(child, clippedLayerInChild));
-        EXPECT_FALSE(occlusion.unoccludedContentRect(parent, clippedLayerInChild).isEmpty());
+        EXPECT_FALSE(occlusion.unoccludedContentRect(child, clippedLayerInChild).isEmpty());
         clippedLayerInChild.move(1, 0);
         clippedLayerInChild.move(1, 0);
         EXPECT_FALSE(occlusion.occluded(child, clippedLayerInChild));
-        EXPECT_FALSE(occlusion.unoccludedContentRect(parent, clippedLayerInChild).isEmpty());
+        EXPECT_FALSE(occlusion.unoccludedContentRect(child, clippedLayerInChild).isEmpty());
         clippedLayerInChild.move(-1, 0);
         clippedLayerInChild.move(0, -1);
         EXPECT_FALSE(occlusion.occluded(child, clippedLayerInChild));
-        EXPECT_FALSE(occlusion.unoccludedContentRect(parent, clippedLayerInChild).isEmpty());
+        EXPECT_FALSE(occlusion.unoccludedContentRect(child, clippedLayerInChild).isEmpty());
         clippedLayerInChild.move(0, 1);
         clippedLayerInChild.move(0, 1);
         EXPECT_FALSE(occlusion.occluded(child, clippedLayerInChild));
-        EXPECT_FALSE(occlusion.unoccludedContentRect(parent, clippedLayerInChild).isEmpty());
+        EXPECT_FALSE(occlusion.unoccludedContentRect(child, clippedLayerInChild).isEmpty());
         clippedLayerInChild.move(0, -1);
 
         occlusion.markOccludedBehindLayer(child);
@@ -1268,7 +1268,7 @@
 
         occlusion.enterTargetRenderSurface(layer->renderSurface());
 
-        EXPECT_TRUE(occlusion.unoccludedContentRect(parent, IntRect(0, 0, 200, 200)).isEmpty());
+        EXPECT_TRUE(occlusion.unoccludedContentRect(layer, IntRect(0, 0, 200, 200)).isEmpty());
 
         occlusion.markOccludedBehindLayer(layer);
         occlusion.leaveToTargetRenderSurface(parent->renderSurface());
@@ -1725,7 +1725,7 @@
 
         typename Types::ContentLayerType* parent = this->createRoot(this->identityMatrix, FloatPoint(0, 0), IntSize(300, 300));
         typename Types::LayerType* container = this->createLayer(parent, this->identityMatrix, FloatPoint(0, 0), IntSize(300, 300));
-        typename Types::ContentLayerType* layer = this->createDrawingSurface(container, transform, FloatPoint(100, 100), IntSize(200, 200), true);
+        typename Types::ContentLayerType* layer = this->createDrawingLayer(container, transform, FloatPoint(100, 100), IntSize(200, 200), true);
         this->calcDrawEtc(parent);
 
         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
@@ -1750,7 +1750,7 @@
 
         typename Types::ContentLayerType* parent = this->createRoot(this->identityMatrix, FloatPoint(0, 0), IntSize(300, 300));
         typename Types::LayerType* container = this->createLayer(parent, this->identityMatrix, FloatPoint(0, 0), IntSize(300, 300));
-        typename Types::ContentLayerType* layer = this->createDrawingSurface(container, transform, FloatPoint(100, 100), IntSize(200, 200), true);
+        typename Types::ContentLayerType* layer = this->createDrawingLayer(container, transform, FloatPoint(100, 100), IntSize(200, 200), true);
         container->setPreserves3D(true);
         this->calcDrawEtc(parent);
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to