Clean up modify-up-on-rtl-wrapping-text test

TBR=drott@chromium.org

Change-Id: I9c026944acad5c4783bbed7dcbea262479fbd707
Reviewed-on: https://chromium-review.googlesource.com/1136388
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574933}

third_party/WebKit/LayoutTests/editing/selection/modify-up-on-rtl-wrapping-text-expected.txt

@@ -6,5 +6,8 @@ PASS: on כ ככ כככ, caret is at 8 initially
 PASS: on כ ככ כככ, caret is at 5 after moving upwards once
 PASS: on כ ככ כככ, caret is at 2 after moving upwards twice
 PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 18 initially
-FAIL: on גכ יגכ יגכ יגכ יגכ, caret is at 15 after moving upwards once but expected at 6
-גכ יגכ יגכ יגכ יגכ
+PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 14 after moving upwards once
+PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 10 after moving upwards twice
+PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 6 after moving upwards 3 times
+PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 3 after moving upwards 4 times
+

third_party/WebKit/LayoutTests/editing/selection/modify-up-on-rtl-wrapping-text.html

@@ -6,69 +6,73 @@
 <script>
 
 if (window.testRunner)
-    testRunner.dumpAsText();
+  testRunner.dumpAsText();
 
 var tests = [
-    {content: "&#1498; &#1500;&#1499;", expected: [2, 4]},
-    {content: "&#1499; &#1499;&#1499; &#1499;&#1499;&#1499;", expected: [2, 5, 8]},
-    {content: "&#1490;&#1499; &#1497;&#1490;&#1499; &#1497;&#1490;&#1499; &#1497;&#1490;&#1499; &#1497;&#1490;&#1499;",
-        expected: [3, 6, 10, 14, 18]},
+  {content: "&#1498; &#1500;&#1499;", expected: [2, 4]},
+  {content: "&#1499; &#1499;&#1499; &#1499;&#1499;&#1499;", expected: [2, 5, 8]},
+  {content: "&#1490;&#1499; &#1497;&#1490;&#1499; &#1497;&#1490;&#1499; &#1497;&#1490;&#1499; &#1497;&#1490;&#1499;",
+    expected: [3, 6, 10, 14, 18]},
 ];
 
 function failed(message) {
-    console.innerHTML += 'FAIL: ' + message + '\n';
+  document.getElementById('console').innerHTML += 'FAIL: ' + message + '\n';
 }
 
 function passed(message) {
-    console.innerHTML += 'PASS: ' + message + '\n';
+  document.getElementById('console').innerHTML += 'PASS: ' + message + '\n';
 }
 
 function runTest(container, test) {
-    container.style.width = '100%';
-    container.innerHTML = test.content;
+  container.style.width = '100%';
+  container.innerHTML = test.content;
 
-    // Starting from 5px, slowly increase the width until each word fits in one line.
-    var heightOfLine = container.offsetHeight;
-    var width = 5;
-    do {
-        container.style.width = width + 'px';
-        width++;
-    } while (container.offsetHeight > heightOfLine * test.expected.length);        
-    container.style.width = (width + 1) + 'px';
+  // Starting from 5px, slowly increase the width until each word fits in one
+  // line.
+  var heightOfLine = container.offsetHeight;
+  var width = 5;
+  do {
+    container.style.width = width + 'px';
+    width++;
+  } while (
+    Math.floor(container.offsetHeight / heightOfLine) > test.expected.length);
+  container.style.width = (width + 1) + 'px';
 
-    var lines = ['st', 'nd', 'rd', 'th'];
-    window.getSelection().collapse(container.lastChild, container.lastChild.length);
+  window.getSelection().collapse(container.lastChild,
+    container.lastChild.length);
 
-    for (var i = 0; i < test.expected.length; i++) {
-        if (!window.getSelection().isCollapsed)
-            return failed('the selection was not collapsed');
+  for (var i = 0; i < test.expected.length; i++) {
+    if (!window.getSelection().isCollapsed)
+      return failed('the selection was not collapsed');
 
-        var range = window.getSelection().getRangeAt(0);
-        if (range.startContainer != container.firstChild)
-            return failed('caret was at a wrong container');
+    var range = window.getSelection().getRangeAt(0);
+    if (range.startContainer != container.firstChild)
+      return failed('caret was at a wrong container');
 
-        var action = 'on ' + test.content + ', caret is at ' + range.startOffset;
-        if (i == 0) action += ' initially';
-        else if (i == 1) action += ' after moving upwards once';
-        else if (i == 2) action += ' after moving upwards twice';
-        else action += ' after moving upwards ' + i + ' times';
-        if (range.startOffset != test.expected[test.expected.length - i - 1])
-            return failed(action + ' but expected at ' + test.expected[i]);
-        passed(action);
-        window.getSelection().modify('move', 'backward', 'line')
+    var action = 'on ' + test.content + ', caret is at ' + range.startOffset;
+    if (i == 0) action += ' initially';
+    else if (i == 1) action += ' after moving upwards once';
+    else if (i == 2) action += ' after moving upwards twice';
+    else action += ' after moving upwards ' + i + ' times';
+    if (range.startOffset != test.expected[test.expected.length - i - 1]) {
+      return failed(action + ' but expected at ' +
+        test.expected[test.expected.length - i - 1]);
     }
+    passed(action);
+    window.getSelection().modify('move', 'backward', 'line')
+  }
 }
 
-var console = document.getElementById('console');
-
 var container = document.createElement('div');
 container.contentEditable = true;
 container.setAttribute('dir', 'rtl');
 document.body.appendChild(container);
 
-for (var i = 0; i < tests.length; i++)
-    runTest(container, tests[i]);
-//container.innerHTML = '';
+for (var i = 0; i < tests.length; i++) {
+  runTest(container, tests[i]);
+}
+
+document.body.removeChild(container);
 
 </script>
 </body>

third_party/WebKit/LayoutTests/platform/win/editing/selection/modify-up-on-rtl-wrapping-text-expected.txt → third_party/WebKit/LayoutTests/platform/mac/editing/selection/modify-up-on-rtl-wrapping-text-expected.txt

@@ -6,8 +6,5 @@ PASS: on כ ככ כככ, caret is at 8 initially
 PASS: on כ ככ כככ, caret is at 5 after moving upwards once
 PASS: on כ ככ כככ, caret is at 2 after moving upwards twice
 PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 18 initially
-PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 14 after moving upwards once
-PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 10 after moving upwards twice
-PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 6 after moving upwards 3 times
-PASS: on גכ יגכ יגכ יגכ יגכ, caret is at 3 after moving upwards 4 times
-גכ יגכ יגכ יגכ יגכ
+FAIL: on גכ יגכ יגכ יגכ יגכ, caret is at 15 after moving upwards once but expected at 14
+