Changeset 243635 in webkit

Timestamp:

Mar 28, 2019, 6:56:51 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

getBoundingClientRect always returns empty rect on a collapsed range
​https://bugs.webkit.org/show_bug.cgi?id=196380

Reviewed by Wenson Hsieh.

Source/WebCore:

The bug was caused by Range::boundingRect merging rects via FloatRect::unite which ignores empty rects.
Use uniteIfNonZero instead to fix the bug. Note that we can't use uniteEvenIfEmpty because that would
set x, y to always 0, 0 as we would end up merging any rect with the initial empty rect.

Test: fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range.html

• dom/Range.cpp:

(WebCore::Range::boundingRect const):

LayoutTests:

Added a regression test.

• fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range-expected.txt: Added.
• fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range-expected.txt (added)
• LayoutTests/fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Range.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        getBoundingClientRect always returns empty rect on a collapsed range
+        https://bugs.webkit.org/show_bug.cgi?id=196380
+
+        Reviewed by Wenson Hsieh.
+
+        Added a regression test.
+
+        * fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range-expected.txt: Added.
+        * fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range.html: Added.
+
 2019-03-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        getBoundingClientRect always returns empty rect on a collapsed range
+        https://bugs.webkit.org/show_bug.cgi?id=196380
+
+        Reviewed by Wenson Hsieh.
+
+        The bug was caused by Range::boundingRect merging rects via FloatRect::unite which ignores empty rects.
+        Use uniteIfNonZero instead to fix the bug. Note that we can't use uniteEvenIfEmpty because that would
+        set x, y to always 0, 0 as we would end up merging any rect with the initial empty rect.
+
+        Test: fast/dom/Range/getBoundingClientRect-on-collapsed-selection-range.html
+
+        * dom/Range.cpp:
+        (WebCore::Range::boundingRect const):
+
 2019-03-28  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/dom/Range.cpp

@@ -1843 +1843 @@
     FloatRect result;
     for (auto& rect : borderAndTextRects(space, respectClippingForTextRects))
-        result.unite(rect);
+        result.uniteIfNonZero(rect);
     return result;
 }