Title: [184992] trunk/Source/WebCore
- Revision
- 184992
- Author
- [email protected]
- Date
- 2015-05-29 10:51:51 -0700 (Fri, 29 May 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184991 => 184992)
--- trunk/Source/WebCore/ChangeLog 2015-05-29 17:45:06 UTC (rev 184991)
+++ trunk/Source/WebCore/ChangeLog 2015-05-29 17:51:51 UTC (rev 184992)
@@ -1,3 +1,16 @@
+2015-05-28 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
Use modern for-loops in WebCore/plugins, storage, style, testing and workers.
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (184991 => 184992)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-05-29 17:45:06 UTC (rev 184991)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-05-29 17:51:51 UTC (rev 184992)
@@ -1419,7 +1419,7 @@
#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.
RenderLayer::IndirectCompositingReason indirectCompositingReason;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
