Changeset 179847 in webkit

Timestamp:

Feb 9, 2015, 3:19:20 PM (12 years ago)

Author:

enrica@apple.com

Message:

Selection flickers when trying to change size of selection.
​https://bugs.webkit.org/show_bug.cgi?id=141404
rdar://problem/18824863

Reviewed by Benjamin Poulain.

When looking for the contracted range from the current range,
we were incorrectly choosing a selection whose rectangle is empty
as a best match candidate. This was throwing off all the logic
and producing a contracted range whose rectangle was bigger than the
expanded range, therefore producing a shrink threshold larger than the
growth one.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::contractedRangeFromHandle):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-09  Enrica Casucci  <enrica@apple.com>
+
+        Selection flickers when trying to change size of selection.
+        https://bugs.webkit.org/show_bug.cgi?id=141404
+        rdar://problem/18824863
+
+        Reviewed by Benjamin Poulain.
+
+        When looking for the contracted range from the current range,
+        we were incorrectly choosing a selection whose rectangle is empty
+        as a best match candidate. This was throwing off all the logic
+        and producing a contracted range whose rectangle was bigger than the
+        expanded range, therefore producing a shrink threshold larger than the
+        growth one.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::contractedRangeFromHandle):
+
 2015-02-09  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1275 +1275 @@
         IntRect copyRect = selectionBoxForRange(newRange.get());
         if (copyRect.isEmpty()) {
-            bestRange = rangeForBlockAtPoint(testPoint);
-            break;
+            // If the new range is an empty rectangle, we try the block at the current point
+            // and see if that has a rectangle that is a better choice.
+            newRange = rangeForBlockAtPoint(testPoint);
+            copyRect = selectionBoxForRange(newRange.get());
         }
         bool isBetterChoice;