Index: Source/core/layout/LayoutBlockFlowLine.cpp |
diff --git a/Source/core/layout/LayoutBlockFlowLine.cpp b/Source/core/layout/LayoutBlockFlowLine.cpp |
index ad2b06e4b80a110f2db1f31c862ec79b0def7483..c582bccc5f9f249916c48b0fb48d757a4a58bdec 100644 |
--- a/Source/core/layout/LayoutBlockFlowLine.cpp |
+++ b/Source/core/layout/LayoutBlockFlowLine.cpp |
@@ -1841,6 +1841,7 @@ bool LayoutBlockFlow::matchedEndLine(LineLayoutState& layoutState, const InlineB |
} |
bool LayoutBlockFlow::generatesLineBoxesForInlineChild(LayoutObject* inlineObj) |
+ |
{ |
ASSERT(inlineObj->parent() == this); |
@@ -1852,9 +1853,13 @@ bool LayoutBlockFlow::generatesLineBoxesForInlineChild(LayoutObject* inlineObj) |
return !it.atEnd(); |
} |
+ |
void LayoutBlockFlow::addOverflowFromInlineChildren() |
{ |
LayoutUnit endPadding = hasOverflowClip() ? paddingEnd() : LayoutUnit(); |
+ // FIXME: Need to find another way to do this, since scrollbars could show when we don't want them to. |
+ if (hasOverflowClip() && !endPadding && node() && node()->isRootEditableElement() && style()->isLeftToRightDirection()) |
+ endPadding = 1; |
for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) { |
addLayoutOverflow(curr->paddedLayoutOverflowRect(endPadding)); |
LayoutRect visualOverflow = curr->visualOverflowRect(curr->lineTop(), curr->lineBottom()); |