Title: [111807] trunk/Source/WebCore
Revision
111807
Author
[email protected]
Date
2012-03-22 19:08:17 -0700 (Thu, 22 Mar 2012)

Log Message

[chromium] Incorrect assert on animating opacity for a surface
https://bugs.webkit.org/show_bug.cgi?id=81994

Patch by Dana Jansens <[email protected]> on 2012-03-22
Reviewed by Adrienne Walker.

Draw opacity and animation state match on the surface itself. A
surface with animating opacity always has an owning layer without
animation, as the surface does the animation for it.

* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::paintLayerContents):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (111806 => 111807)


--- trunk/Source/WebCore/ChangeLog	2012-03-23 01:54:09 UTC (rev 111806)
+++ trunk/Source/WebCore/ChangeLog	2012-03-23 02:08:17 UTC (rev 111807)
@@ -1,5 +1,19 @@
 2012-03-22  Dana Jansens  <[email protected]>
 
+        [chromium] Incorrect assert on animating opacity for a surface
+        https://bugs.webkit.org/show_bug.cgi?id=81994
+
+        Reviewed by Adrienne Walker.
+
+        Draw opacity and animation state match on the surface itself. A
+        surface with animating opacity always has an owning layer without
+        animation, as the surface does the animation for it.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::paintLayerContents):
+
+2012-03-22  Dana Jansens  <[email protected]>
+
         [chromium] Skip frames when checkerboarding an animation
         https://bugs.webkit.org/show_bug.cgi?id=81716
 

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (111806 => 111807)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp	2012-03-23 01:54:09 UTC (rev 111806)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp	2012-03-23 02:08:17 UTC (rev 111807)
@@ -554,7 +554,7 @@
     CCLayerIteratorType end = CCLayerIteratorType::end(&renderSurfaceLayerList);
     for (CCLayerIteratorType it = CCLayerIteratorType::begin(&renderSurfaceLayerList); it != end; ++it) {
         if (it.representsTargetRenderSurface()) {
-            ASSERT(it->renderSurface()->drawOpacity() || it->drawOpacityIsAnimating());
+            ASSERT(it->renderSurface()->drawOpacity() || it->renderSurface()->drawOpacityIsAnimating());
 
             occlusionTracker.finishedTargetRenderSurface(*it, it->renderSurface());
             paintMaskAndReplicaForRenderSurface(*it, paintType);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to