Changeset 184992 in webkit

Timestamp:

May 29, 2015 10:51:51 AM (9 years ago)

Author:

Simon Fraser

Message:

Some assertion failures in compositing code after r183820
​https://bugs.webkit.org/show_bug.cgi?id=144630

Reviewed by Alexey Proskuryakov.

Reinstate the assertion commented out in r183843. Fixed by having blending no longer
escape the media elements, which was fixed via bug 145420.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::computeCompositingRequirements):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Some assertion failures in compositing code after r183820
+        https://bugs.webkit.org/show_bug.cgi?id=144630
+
+        Reviewed by Alexey Proskuryakov.
+
+        Reinstate the assertion commented out in r183843. Fixed by having blending no longer
+        escape the media elements, which was fixed via bug 145420.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+
 2015-05-29  Hunseop Jeong  <hs85.jeong@samsung.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1420 +1420 @@
 #if ENABLE(CSS_COMPOSITING)
     layer.setHasNotIsolatedCompositedBlendingDescendants(childState.hasNotIsolatedCompositedBlendingDescendants);
-    // ASSERT(!layer.hasNotIsolatedCompositedBlendingDescendants() || layer.hasNotIsolatedBlendingDescendants());
+    ASSERT(!layer.hasNotIsolatedCompositedBlendingDescendants() || layer.hasNotIsolatedBlendingDescendants());
 #endif
     // Now check for reasons to become composited that depend on the state of descendant layers.