diff options
| author | Steve Block <steveblock@google.com> | 2011-09-06 16:52:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 16:52:17 -0700 |
| commit | 9cfd265316cc519626b677f26e498d8561088b2c (patch) | |
| tree | 3cc0aae7b498e576f2c9bab4e761d53992b463ee /Source/WebCore/rendering/RenderInline.cpp | |
| parent | b044262815d6227fa0c72415ad4410992b65a35f (diff) | |
| parent | b90b090d812ef12f33a11165f8b844cac500df3b (diff) | |
| download | external_webkit-9cfd265316cc519626b677f26e498d8561088b2c.zip external_webkit-9cfd265316cc519626b677f26e498d8561088b2c.tar.gz external_webkit-9cfd265316cc519626b677f26e498d8561088b2c.tar.bz2 | |
Merge "Cherry-pick WebKit change 85623 to fix RenderInline::culledInlineAbsoluteQuads()"
Diffstat (limited to 'Source/WebCore/rendering/RenderInline.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderInline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp index ae18514..13cadfa 100644 --- a/Source/WebCore/rendering/RenderInline.cpp +++ b/Source/WebCore/rendering/RenderInline.cpp @@ -567,6 +567,11 @@ void RenderInline::absoluteQuads(Vector<FloatQuad>& quads) void RenderInline::culledInlineAbsoluteQuads(const RenderInline* container, Vector<FloatQuad>& quads) { + if (!culledInlineFirstLineBox()) { + quads.append(localToAbsoluteQuad(FloatRect())); + return; + } + bool isHorizontal = style()->isHorizontalWritingMode(); for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) { if (curr->isFloatingOrPositioned()) |