Remove obsolete LTR scrollbar padding hack.

BUG=474759

Review URL: https://codereview.chromium.org/1284783003

git-svn-id: svn://svn.chromium.org/blink/trunk@200378 bbb929c8-8fbe-4397-9dbb-9b2b20218538

3 files changed, 40 insertions, 13 deletions

diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 24e6f46..56dee3b 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -920,6 +920,41 @@ crbug.com/504703 inspector-protocol/debugger/debugger-step-into-dedicated-worker
 crbug.com/445194 [ Debug ] fast/dom/shadow/focus-controller-recursion-crash.html [ Skip ]
 crbug.com/505387 [ Win ] virtual/prefer_compositing_to_lcd_text/scrollbars/rtl/overflow-scroll-rtl.html [ ImageOnlyFailure ]
 
+crbug.com/474759 css3/selectors3/html/css3-modsel-23.html [ NeedsRebaseline ]
+crbug.com/474759 css3/selectors3/html/css3-modsel-69.html [ NeedsRebaseline ]
+crbug.com/474759 css3/selectors3/xhtml/css3-modsel-23.xml [ NeedsRebaseline ]
+crbug.com/474759 css3/selectors3/xhtml/css3-modsel-69.xml [ NeedsRebaseline ]
+crbug.com/474759 css3/selectors3/xml/css3-modsel-23.xml [ NeedsRebaseline ]
+crbug.com/474759 css3/selectors3/xml/css3-modsel-69.xml [ NeedsRebaseline ]
+crbug.com/474759 editing/input/caret-at-the-edge-of-contenteditable.html [ NeedsRebaseline ]
+crbug.com/474759 editing/input/caret-at-the-edge-of-input.html [ NeedsRebaseline ]
+crbug.com/474759 editing/input/editable-container-with-word-wrap-normal.html [ NeedsRebaseline ]
+crbug.com/474759 editing/pasteboard/drop-text-without-selection.html [ NeedsRebaseline ]
+crbug.com/474759 fast/clip/outline-overflowClip.html [ NeedsRebaseline ]
+crbug.com/474759 fast/css/text-overflow-input.html [ NeedsRebaseline ]
+crbug.com/474759 fast/events/autoscroll.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/basic-inputs.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/control-restrict-line-height.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-appearance-preventDefault.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-appearance-selection.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-disabled-color.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-text-drag-down.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-text-scroll-left-on-blur.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-text-word-wrap.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/input-type-text-min-width.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/minWidthPercent.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/tabbing-input-iframe.html [ NeedsRebaseline ]
+crbug.com/474759 fast/forms/textfield-outline.html [ NeedsRebaseline ]
+crbug.com/474759 fast/overflow/overflow-focus-ring.html [ NeedsRebaseline ]
+crbug.com/474759 fast/repaint/caret-invalidation-in-overflow-scroll.html [ NeedsRebaseline ]
+crbug.com/474759 fast/replaced/width100percent-searchfield.html [ NeedsRebaseline ]
+crbug.com/474759 fast/replaced/width100percent-textfield.html [ NeedsRebaseline ]
+crbug.com/474759 tables/mozilla/bugs/bug59354.html [ NeedsRebaseline ]
+crbug.com/474759 tables/mozilla/bugs/bug96334.html [ NeedsRebaseline ]
+crbug.com/474759 fast/css/input-search-padding.html [ NeedsRebaseline ]
+crbug.com/474759 virtual/pointerevent/fast/events/autoscroll.html [ NeedsRebaseline ]
+crbug.com/474759 virtual/trustedeventsdefaultaction/fast/events/autoscroll.html [ NeedsRebaseline ]
+
 crbug.com/505415 [ XP ] accessibility/canvas-fallback-content-labels.html [ Failure ]
 
 crbug.com/506312 imported/csswg-test/css-pseudo-4/first-letter-001.html [ ImageOnlyFailure ]
@@ -2101,7 +2136,6 @@ crbug.com/509025 [ Yosemite ] css2.1/t1202-counter-04-b.html [ Failure ]
 crbug.com/509025 [ Yosemite ] css2.1/t1202-counters-04-b.html [ Failure ]
 crbug.com/509025 [ Yosemite ] fast/block/lineboxcontain/block-with-ideographs.xhtml [ Failure ]
 # TODO(tkent): Needs to increase padding-right.
-crbug.com/509025 [ Yosemite ] fast/css/input-search-padding.html [ Failure ]
 crbug.com/509025 [ Yosemite ] fast/encoding/denormalised-voiced-japanese-chars.html [ Failure ]
 # TODO(tkent): zoom:1.5 looks to have a real problem.
 crbug.com/509025 [ Yosemite ] fast/forms/submit/submit-appearance-basic.html [ Failure ]
@@ -2159,9 +2193,7 @@ crbug.com/509025 [ Yosemite ] tables/mozilla_expected_failures/collapsing_border
 crbug.com/509025 [ Yosemite ] tables/mozilla_expected_failures/collapsing_borders/bug41262-6.html [ Failure ]
 #crbug.com/509025 [ Yosemite ] fast/text/emphasis.html [ Failure ]
 crbug.com/509025 [ Yosemite ] fast/text/international/complex-character-based-fallback.html [ Failure ]
-crbug.com/509025 [ Yosemite ] virtual/pointerevent/fast/events/autoscroll.html [ Failure ImageOnlyFailure ]
 crbug.com/509025 [ Yosemite ] virtual/pointerevent/fast/events/context-no-deselect.html [ Failure ]
-crbug.com/509025 [ Yosemite ] virtual/trustedeventsdefaultaction/fast/events/autoscroll.html [ Failure ]
 crbug.com/509025 [ Yosemite ] virtual/trustedeventsdefaultaction/fast/events/context-no-deselect.html [ Failure ]
 crbug.com/509025 [ Yosemite ] virtual/prefer_compositing_to_lcd_text/compositing/overflow/theme-affects-visual-overflow.html [ Failure ]
 
diff --git a/third_party/WebKit/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html b/third_party/WebKit/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html
index 21a5ce1..cd22d46 100644
--- a/third_party/WebKit/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html
+++ b/third_party/WebKit/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html> 
+<!DOCTYPE html>
 <html>
 <head>
 <title> Testcase for bug https://bugs.webkit.org/show_bug.cgi?id=89649 </title>
@@ -16,7 +16,7 @@
 <script>
 function runTest() {
     description('Testcase for bug <a href="http://www.webkit.org/b/89649">http://www.webkit.org/b/89649</a>. \
-The test case checks if caret is drawn properly(especially scrolls properly) inside a editable container having word-wrap:normal.');
+The test case checks if caret is drawn properly (especially scrolls properly) inside a editable container having word-wrap:normal.');
 
     editableContainer = document.getElementById('test');
     editableContainer.focus();
@@ -38,9 +38,9 @@ The test case checks if caret is drawn properly(especially scrolls properly) ins
 
     debug('<br>Final caret rect is calculated by following constraints');
     debug('1) ScrollWidth = text content width + caret width');
-    debug('2) Caret rect is always within container bounding box (thus substracting the scroll left)');
-    shouldBe("startCaretRect.left + editableContainer.scrollWidth - editableContainer.scrollLeft - caretWidth", "finalCaretRect.right");
-    
+    debug('2) Caret rect is always within container bounding box (thus subtracting the scroll left)');
+    shouldBe("startCaretRect.left + editableContainer.scrollWidth - editableContainer.scrollLeft", "finalCaretRect.right");
+
     document.body.removeChild(editableContainer);
     isSuccessfullyParsed();
  }
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
index ae3ec95..1c19227 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -1840,7 +1840,6 @@ bool LayoutBlockFlow::matchedEndLine(LineLayoutState& layoutState, const InlineB
 }
 
 bool LayoutBlockFlow::generatesLineBoxesForInlineChild(LayoutObject* inlineObj)
-
 {
     ASSERT(inlineObj->parent() == this);
 
@@ -1852,13 +1851,9 @@ 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());