Changeset 248345 in webkit

Timestamp:

Aug 6, 2019, 11:52:19 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r247730. rdar://problem/54017873

Long press hint of AirPods buy buttons are tall and narrow during animation
​https://bugs.webkit.org/show_bug.cgi?id=200036
<rdar://problem/53145697>

Reviewed by Wenson Hsieh.

Source/WebCore:

New test: fast/text-indicator/text-indicator-with-tiny-child.html

• dom/Range.cpp: (WebCore::Range::borderAndTextRects const):
• dom/Range.h: Add a BoundingRectBehavior that ignores 1x1 and smaller rects.

• page/TextIndicator.cpp: (WebCore::absoluteBoundingRectForRange): Enable IgnoreTinyRects.

LayoutTests:

• fast/text-indicator/text-indicator-with-tiny-child-expected.txt: Added.
• fast/text-indicator/text-indicator-with-tiny-child.html: Added.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@247730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text-indicator/text-indicator-with-tiny-child-expected.txt (added)
• LayoutTests/fast/text-indicator/text-indicator-with-tiny-child.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Range.cpp (modified) (1 diff)
• Source/WebCore/dom/Range.h (modified) (1 diff)
• Source/WebCore/page/TextIndicator.cpp (modified) (1 diff)

branches/safari-608.1-branch/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r247730. rdar://problem/54017873
+
+    Long press hint of AirPods buy buttons are tall and narrow during animation
+    https://bugs.webkit.org/show_bug.cgi?id=200036
+    <rdar://problem/53145697>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/WebCore:
+    
+    New test: fast/text-indicator/text-indicator-with-tiny-child.html
+    
+    * dom/Range.cpp:
+    (WebCore::Range::borderAndTextRects const):
+    * dom/Range.h:
+    Add a BoundingRectBehavior that ignores 1x1 and smaller rects.
+    
+    * page/TextIndicator.cpp:
+    (WebCore::absoluteBoundingRectForRange):
+    Enable IgnoreTinyRects.
+    
+    LayoutTests:
+    
+    * fast/text-indicator/text-indicator-with-tiny-child-expected.txt: Added.
+    * fast/text-indicator/text-indicator-with-tiny-child.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-23  Tim Horton  <timothy_horton@apple.com>
+
+            Long press hint of AirPods buy buttons are tall and narrow during animation
+            https://bugs.webkit.org/show_bug.cgi?id=200036
+            <rdar://problem/53145697>
+
+            Reviewed by Wenson Hsieh.
+
+            * fast/text-indicator/text-indicator-with-tiny-child-expected.txt: Added.
+            * fast/text-indicator/text-indicator-with-tiny-child.html: Added.
+
 2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r247730. rdar://problem/54017873
+
+    Long press hint of AirPods buy buttons are tall and narrow during animation
+    https://bugs.webkit.org/show_bug.cgi?id=200036
+    <rdar://problem/53145697>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/WebCore:
+    
+    New test: fast/text-indicator/text-indicator-with-tiny-child.html
+    
+    * dom/Range.cpp:
+    (WebCore::Range::borderAndTextRects const):
+    * dom/Range.h:
+    Add a BoundingRectBehavior that ignores 1x1 and smaller rects.
+    
+    * page/TextIndicator.cpp:
+    (WebCore::absoluteBoundingRectForRange):
+    Enable IgnoreTinyRects.
+    
+    LayoutTests:
+    
+    * fast/text-indicator/text-indicator-with-tiny-child-expected.txt: Added.
+    * fast/text-indicator/text-indicator-with-tiny-child.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-23  Tim Horton  <timothy_horton@apple.com>
+
+            Long press hint of AirPods buy buttons are tall and narrow during animation
+            https://bugs.webkit.org/show_bug.cgi?id=200036
+            <rdar://problem/53145697>
+
+            Reviewed by Wenson Hsieh.
+
+            New test: fast/text-indicator/text-indicator-with-tiny-child.html
+
+            * dom/Range.cpp:
+            (WebCore::Range::borderAndTextRects const):
+            * dom/Range.h:
+            Add a BoundingRectBehavior that ignores 1x1 and smaller rects.
+
+            * page/TextIndicator.cpp:
+            (WebCore::absoluteBoundingRectForRange):
+            Enable IgnoreTinyRects.
+
 2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebCore/dom/Range.cpp

@@ -1854 +1854 @@
     }
 
+    if (rectOptions.contains(BoundingRectBehavior::IgnoreTinyRects)) {
+        rects.removeAllMatching([&] (const FloatRect& rect) -> bool {
+            return rect.area() <= 1;
+        });
+    }
+
     return rects;
 }

branches/safari-608.1-branch/Source/WebCore/dom/Range.h

@@ -120 +120 @@
         RespectClipping = 1 << 0,
         UseVisibleBounds = 1 << 1,
+        IgnoreTinyRects = 1 << 2,
     };
 

branches/safari-608.1-branch/Source/WebCore/page/TextIndicator.cpp

@@ -227 +227 @@
     return range.absoluteBoundingRect({
         Range::BoundingRectBehavior::RespectClipping,
-        Range::BoundingRectBehavior::UseVisibleBounds
+        Range::BoundingRectBehavior::UseVisibleBounds,
+        Range::BoundingRectBehavior::IgnoreTinyRects,
     });
 }