[chromium] Incorrect assert on animating opacity for a surface
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Mar 2012 02:08:17 +0000 (02:08 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Mar 2012 02:08:17 +0000 (02:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81994

Patch by Dana Jansens <danakj@chromium.org> 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111807 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp

index 9b0998d..9e90483 100644 (file)
@@ -1,5 +1,19 @@
 2012-03-22  Dana Jansens  <danakj@chromium.org>
 
+        [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  <danakj@chromium.org>
+
         [chromium] Skip frames when checkerboarding an animation
         https://bugs.webkit.org/show_bug.cgi?id=81716
 
index 8e375de..0290a75 100644 (file)
@@ -554,7 +554,7 @@ void CCLayerTreeHost::paintLayerContents(const LayerList& renderSurfaceLayerList
     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);