diff options
| author | Steve Block <steveblock@google.com> | 2012-04-13 07:46:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-13 07:46:47 -0700 |
| commit | 1ba7eb1b35cf60d5f7fdd1e8eb7a55807bcf8f2a (patch) | |
| tree | ab8fb70a9a87f161a60382f76b6b15c6f9894acd | |
| parent | 11509d7f3708f8559703a5cc689a212af4efee62 (diff) | |
| parent | a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843 (diff) | |
| download | external_webkit-1ba7eb1b35cf60d5f7fdd1e8eb7a55807bcf8f2a.zip external_webkit-1ba7eb1b35cf60d5f7fdd1e8eb7a55807bcf8f2a.tar.gz external_webkit-1ba7eb1b35cf60d5f7fdd1e8eb7a55807bcf8f2a.tar.bz2 | |
Merge "Cherry-pick WebKit change r99731 to fix a LayoutTest crash"
| -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(); } } |