Attachment 140056 Details for Bug 85512 – Quick 'n' dirty fix 1. Don't have time to do the iterator, will file a bug about that.

[patch] Quick 'n' dirty fix 1. Don't have time to do the iterator, will file a bug about that.

bug-85512-20120503113904.patch (text/plain), 2.43 KB, created by Julien Chaffraix on 2012-05-03 11:39:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Chaffraix

Created: 2012-05-03 11:39:05 PDT

Size: 2.43 KB

patch

obsolete

>Subversion Revision: 115975
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0dc89a61b3dd79fffca91d73c29bfcdea2d5d1aa..733fc7f66bddfbcc14102a9a7c0b3ec22ae4a795 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2012-05-03  Julien Chaffraix  <jchaffraix@webkit.org>
>+
>+        ASSERT(!m_zOrderListsDirty) is triggering in Safari
>+        https://bugs.webkit.org/show_bug.cgi?id=85512
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Unfortunately no test as I don't think the 2 cases are testable reliably.
>+
>+        A better fix would be to introduce some iterator that handle updating the
>+        lists for you. For now, just adding the missing updateLayerListsIfNeeded()
>+        calls.
>+
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::hasVisibleNonCompositingDescendantLayers):
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::RenderLayerCompositor::layerHas3DContent):
>+
> 2012-05-03  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
> 
>         Remove extra checks for empty string when parsing CSS value
>diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
>index e394b61d772ac0a8452355bab699c3ef42f4755f..f6a60331d6446a495a8447a601df9742e9f29169 100644
>--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
>+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
>@@ -907,6 +907,8 @@ bool RenderLayerBacking::containsNonEmptyRenderers() const
> // Conservative test for having no rendered children.
> bool RenderLayerBacking::hasVisibleNonCompositingDescendantLayers() const
> {
>+    m_owningLayer->updateLayerListsIfNeeded();
>+
> #if !ASSERT_DISABLED
>     LayerListMutationDetector mutationChecker(m_owningLayer);
> #endif
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>index d45e0ad04ccc11d3636f403e216200d897057ed5..1ad94fd8e18bb6a04111db9d45369dfc80d114e7 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>@@ -2228,6 +2228,8 @@ bool RenderLayerCompositor::layerHas3DContent(const RenderLayer* layer) const
>          style->transform().has3DOperation()))
>         return true;
> 
>+    const_cast<RenderLayer*>(layer)->updateLayerListsIfNeeded();
>+
> #if !ASSERT_DISABLED
>     LayerListMutationDetector mutationChecker(const_cast<RenderLayer*>(layer));
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 85512: 140056 | 140099