[chromium] assertion being hit in CCLayerTreeHost::updateCompositorResources

https://bugs.webkit.org/show_bug.cgi?id=82239

Patch by Dana Jansens <danakj@chromium.org> on 2012-03-26
Reviewed by Adrienne Walker.

The assert is incorrect and should check the animation state on
the surface, not the owning layer.

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

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a3453d1..6689b77 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-26  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] assertion being hit in CCLayerTreeHost::updateCompositorResources
+        https://bugs.webkit.org/show_bug.cgi?id=82239
+
+        Reviewed by Adrienne Walker.
+
+        The assert is incorrect and should check the animation state on
+        the surface, not the owning layer.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::updateCompositorResources):
+
 2012-03-26  Levi Weintraub  <leviw@chromium.org>
 
         Correct LayoutUnit usage in RenderFieldSet and RenderMenuItem

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
index 0290a75..f7e32d0 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
@@ -579,7 +579,7 @@ void CCLayerTreeHost::updateCompositorResources(GraphicsContext3D* context, CCTe
     CCLayerIteratorType end = CCLayerIteratorType::end(&m_updateList);
     for (CCLayerIteratorType it = CCLayerIteratorType::begin(&m_updateList); it != end; ++it) {
         if (it.representsTargetRenderSurface()) {
-            ASSERT(it->renderSurface()->drawOpacity() || it->drawOpacityIsAnimating());
+            ASSERT(it->renderSurface()->drawOpacity() || it->renderSurface()->drawOpacityIsAnimating());
             if (it->maskLayer())
                 it->maskLayer()->updateCompositorResources(context, updater);