Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
index cce40511d6a42c1b164bcfe0dd295242bad2bea9..72951090977244960c790aeb0295210324c88a35 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
@@ -1856,6 +1856,7 @@ bool LayoutBlockFlow::matchedEndLine(LineLayoutState& layoutState, const InlineB |
} |
bool LayoutBlockFlow::generatesLineBoxesForInlineChild(LayoutObject* inlineObj) |
+ |
{ |
ASSERT(inlineObj->parent() == this); |
@@ -1867,9 +1868,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()); |