diff --git a/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs
index bd66571f8a658a..c5f0fa3ba5757b 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs
@@ -197,12 +197,12 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'WordWrap', function() {
 
   var extractor = new cvox.ContentEditableExtractor();
   extractor.update(textbox);
-  assertEquals('One two three', extractor.getText());
+  assertEquals('One\ntwo\nthree', extractor.getText());
   assertEquals(0, extractor.getLineStart(0));
-  assertEquals(3, extractor.getLineEnd(0));
-  assertEquals(3, extractor.getLineStart(1));
-  assertEquals(7, extractor.getLineEnd(1));
-  assertEquals(7, extractor.getLineStart(2));
+  assertEquals(4, extractor.getLineEnd(0));
+  assertEquals(4, extractor.getLineStart(1));
+  assertEquals(8, extractor.getLineEnd(1));
+  assertEquals(8, extractor.getLineStart(2));
   assertEquals(13, extractor.getLineEnd(2));
 
   // Test all possible cursor positions.
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Range/get-bounding-client-rect-empty-and-non-empty.html b/third_party/WebKit/LayoutTests/fast/dom/Range/get-bounding-client-rect-empty-and-non-empty.html
new file mode 100644
index 00000000000000..dbaac62086570e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/dom/Range/get-bounding-client-rect-empty-and-non-empty.html
@@ -0,0 +1,70 @@
+<!DOCTPYE html>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
+<style>
+html, body {
+  margin: 0;
+}
+
+#container > div {
+  font-size: 10px;
+  width: 5ch;
+  border: thin solid black;
+}
+</style>
+<div id="log"></div>
+<div id="container">
+  <div id="normal-wrap">0123 456</div>
+  <div id="normal-wrap-with-overflow-space">01234 567</div>
+  <div id="pre-wrap" style="white-space: pre-wrap">0123 45678</div>
+  <div id="pre-wrap-with-overflow-space" style="white-space: pre-wrap">01234 5678</div>
+  <div id="break-word" style="word-wrap: break-word">0123456789</div>
+  <div id="pre" style="white-space:pre">a
+b<span></span>b</div>
+</div>
+<script>
+var range = document.createRange();
+
+testWhenFirstRectIsEmpty("normal-wrap", [4]);
+testWhenFirstRectIsEmpty("normal-wrap-with-overflow-space", [5]);
+testWhenFirstRectIsEmpty("pre-wrap", [3, 4, 5]);
+testWhenFirstRectIsEmpty("pre-wrap-with-overflow-space", [4, 5, 6]);
+testWhenFirstRectIsEmpty("break-word", [4, 5]);
+testWhenFirstRectIsEmpty("pre", [0, 1, 2]);
+
+function testWhenFirstRectIsEmpty(id, offsets) {
+  let element = document.getElementById(id);
+  let node = element.firstChild;
+  for (let offset of offsets) {
+    range.setStart(node, offset);
+    range.setEnd(node, offset + 1);
+    let rects = range.getClientRects();
+    let bounds = range.getBoundingClientRect();
+    if (rects.length <= 1)
+      continue;
+
+    if (!bounds.width || !bounds.height) {
+      // If all rects are empty, bounds should be equal to rects[0].
+      test(() => assert_equals_rect(bounds, rects[0]),
+        `${name}[${offset}]: ${rectToString(bounds)} should be equal to the first of ${rectsToString(rects)}`);
+    } else {
+      // Otherwise, it should be the union of rects excluding empty ones.
+      // Since we measure one character, it should have the same height as rects[0].
+      test(() => assert_equals(bounds.height, rects[0].height),
+        `${name}[${offset}]: Height of ${rectToString(bounds)} should match to the first of ${rectsToString(rects)}`);
+    }
+  }
+}
+
+function assert_equals_rect(actual, expected, description) {
+  for (let prop in expected)
+    assert_equals(actual[prop], expected[prop], description + "." + prop);
+}
+function rectsToString(rects) {
+  return "[" + Array.prototype.map.call(rects, rectToString).join() + "]";
+}
+
+function rectToString(r) {
+  return "(" + r.left + "," + r.top + "-" + r.width + "," + r.height + ")";
+}
+</script>
diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp
index b662e2bbdc9d43..4ccba20c1e763c 100644
--- a/third_party/WebKit/Source/core/dom/Range.cpp
+++ b/third_party/WebKit/Source/core/dom/Range.cpp
@@ -1582,16 +1582,12 @@ FloatRect Range::boundingRect() const
     getBorderAndTextQuads(quads);
 
     FloatRect result;
-    // As per section 10 in https://www.w3.org/TR/cssom-view/
-    // "Return a static DOMRect object describing the smallest rectangle that
-    // includes the first rectangle in list and all of the remaining rectangles
-    // of which the height or width is not zero."
-    for (const FloatQuad& quad : quads) {
-        if (result.isEmpty())
-            result.uniteIfNonZero(quad.boundingBox());
-        else
-            result.unite(quad.boundingBox()); // Skips empty rects.
-    }
+    for (const FloatQuad& quad : quads)
+        result.unite(quad.boundingBox()); // Skips empty rects.
+
+    // If all rects are empty, return the first rect.
+    if (result.isEmpty() && !quads.isEmpty())
+        return quads.first().boundingBox();
 
     return result;
 }