From a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 12 Apr 2012 14:58:30 +0100 Subject: Cherry-pick WebKit change r99731 to fix a LayoutTest crash svg/foreignObject/absolute-position-foreign-object-child-crash.html See http://trac.webkit.org/changeset/99731 Bug: 6329122 Change-Id: Ibee43b565d69507c4abace7e1ab298c660de137f --- Source/WebCore/rendering/RenderObject.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp index 8caef04..f37753e 100644 --- a/Source/WebCore/rendering/RenderObject.cpp +++ b/Source/WebCore/rendering/RenderObject.cpp @@ -2029,6 +2029,10 @@ RenderObject* RenderObject::container(RenderBoxModelObject* repaintContainer, bo while (o && o->style()->position() == StaticPosition && !o->isRenderView() && !(o->hasTransform() && o->isRenderBlock())) { if (repaintContainerSkipped && o == repaintContainer) *repaintContainerSkipped = true; +#if ENABLE(SVG) + if (o->isSVGForeignObject()) // foreignObject is the containing block for contents inside it + break; +#endif o = o->parent(); } } -- cgit v1.1