diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 14:58:30 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 18:44:15 +0100 |
| commit | a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843 (patch) | |
| tree | 2ddd60fd45ba8dffe03b6ffff031dbcb4c35e366 /Source/WebCore/rendering | |
| parent | bb0dba49203d72577b8eac34537c9c671ba9bec7 (diff) | |
| download | external_webkit-a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843.zip external_webkit-a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843.tar.gz external_webkit-a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843.tar.bz2 | |
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
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderObject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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(); } } |