Changeset 221443 in webkit

Timestamp:

Aug 31, 2017, 2:13:38 PM (8 years ago)

Author:

Megan Gardner

Message:

Remove IsBlockSelection flag
​https://bugs.webkit.org/show_bug.cgi?id=176141

Reviewed by Dean Jackson.

Block selection is disabled. Removed code associated with this flag to allow removal of the
flag in UIKit.

No tests for a removed feature.

• Platform/spi/ios/UIKitSPI.h:
• Shared/ios/GestureTypes.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(toUIWKSelectionFlags):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::rangeForWebSelectionAtPosition):
(WebKit::WebPage::selectWithGesture):
(WebKit::WebPage::contractedRangeFromHandle):
(WebKit::WebPage::computeExpandAndShrinkThresholdsForHandle):
(WebKit::WebPage::updateBlockSelectionWithTouch):
(WebKit::WebPage::updateSelectionWithTouches):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• Shared/ios/GestureTypes.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-30  Megan Gardner  <megan_gardner@apple.com>
+
+        Remove IsBlockSelection flag
+        https://bugs.webkit.org/show_bug.cgi?id=176141
+
+        Reviewed by Dean Jackson.
+
+        Block selection is disabled. Removed code associated with this flag to allow removal of the
+        flag in UIKit.
+        
+        No tests for a removed feature.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * Shared/ios/GestureTypes.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (toUIWKSelectionFlags):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::rangeForWebSelectionAtPosition):
+        (WebKit::WebPage::selectWithGesture):
+        (WebKit::WebPage::contractedRangeFromHandle):
+        (WebKit::WebPage::computeExpandAndShrinkThresholdsForHandle):
+        (WebKit::WebPage::updateBlockSelectionWithTouch):
+        (WebKit::WebPage::updateSelectionWithTouches):
+
 2017-08-30  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -508 +508 @@
     UIWKNone = 0,
     UIWKWordIsNearTap = 1,
-    UIWKIsBlockSelection = 2,
     UIWKPhraseBoundaryChanged = 4,
 };

trunk/Source/WebKit/Shared/ios/GestureTypes.h

@@ -74 +74 @@
     None = 0,
     WordIsNearTap = 1 << 0,
-    IsBlockSelection = 1 << 1,
-    PhraseBoundaryChanged = 1 << 2,
+    PhraseBoundaryChanged = 1 << 1,
 };
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -2463 +2463 @@
     if (flags & WordIsNearTap)
         uiFlags |= UIWKWordIsNearTap;
-    if (flags & IsBlockSelection)
-        uiFlags |= UIWKIsBlockSelection;
     if (flags & PhraseBoundaryChanged)
         uiFlags |= UIWKPhraseBoundaryChanged;

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

@@ -1017 +1017 @@
         return nullptr;
 
-    flags = IsBlockSelection;
     range = Range::create(bestChoice->document());
     range->selectNodeContents(*bestChoice);
@@ -1173 +1172 @@
         }
         range = rangeForWebSelectionAtPosition(point, position, flags);
-        if (wkGestureState == GestureRecognizerState::Ended && flags & IsBlockSelection)
-            m_currentBlockSelection = range;
         break;
 
@@ -1430 +1427 @@
     IntRect currentBox = selectionBoxForRange(&currentRange);
     IntPoint edgeCenter = computeEdgeCenter(currentBox, handlePosition);
-    flags = IsBlockSelection;
 
     float maxDistance;
@@ -1614 +1610 @@
         growThreshold = maxThreshold;
 
-    if (flags & IsBlockSelection && areRangesEqual(contractedRange.get(), currentRange.get()))
-        shrinkThreshold = minThreshold;
 }
 
@@ -1656 +1650 @@
     float growThreshold = 0;
     float shrinkThreshold = 0;
-    SelectionFlags flags = IsBlockSelection;
+    SelectionFlags flags = None;
 
     switch (static_cast<SelectionTouch>(touch)) {
@@ -1763 +1757 @@
         if (shouldSwitchToBlockModeForHandle(pointInDocument, handlePosition)) {
             range = switchToBlockSelectionAtPoint(pointInDocument, handlePosition);
-            flags = IsBlockSelection;
         } else
             range = rangeForPosition(&frame, position, baseIsStart);
         break;
     }
-    if (range && flags != IsBlockSelection)
+    if (range)
         frame.selection().setSelectedRange(range.get(), position.affinity(), true, UserTriggered);
 
     send(Messages::WebPageProxy::TouchesCallback(point, touches, flags, callbackID));
-    if (range && flags == IsBlockSelection) {
-        // We just switched to block selection therefore we need to compute the thresholds.
-        m_currentBlockSelection = range;
-        frame.selection().setSelectedRange(range.get(), position.affinity(), true, UserTriggered);
-        
-        float growThreshold = 0;
-        float shrinkThreshold = 0;
-        computeExpandAndShrinkThresholdsForHandle(point, handlePosition, growThreshold, shrinkThreshold);
-        send(Messages::WebPageProxy::DidUpdateBlockSelectionWithTouch(static_cast<uint32_t>(SelectionTouch::Started), static_cast<uint32_t>(IsBlockSelection), growThreshold, shrinkThreshold));
-    }
 }