Changeset 246090 in webkit

Timestamp:

Jun 4, 2019, 5:23:59 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r246086.
​https://bugs.webkit.org/show_bug.cgi?id=198549

Causing Internal build failures (Requested by ShawnRoberts on
#webkit).

Reverted changeset:

"Remove some unused selection code"
​https://bugs.webkit.org/show_bug.cgi?id=198451
​https://trac.webkit.org/changeset/246086

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-04  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r246086.
+        https://bugs.webkit.org/show_bug.cgi?id=198549
+
+        Causing Internal build failures (Requested by ShawnRoberts on
+        #webkit).
+
+        Reverted changeset:
+
+        "Remove some unused selection code"
+        https://bugs.webkit.org/show_bug.cgi?id=198451
+        https://trac.webkit.org/changeset/246086
+
 2019-06-04  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -531 +531 @@
 @end
 
+@interface UIWebSelectionView : UIView
+@end
+
+@interface UIWebSelectionAssistant : NSObject <UIGestureRecognizerDelegate>
+@end
+
 @protocol UISelectionInteractionAssistant
 - (void)showSelectionCommands;
+@end
+
+@interface UIWebSelectionAssistant ()
+- (BOOL)isSelectionGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer;
+- (id)initWithView:(UIView *)view;
+- (void)clearSelection;
+- (void)didEndScrollingOrZoomingPage;
+- (void)didEndScrollingOverflow;
+- (void)resignedFirstResponder;
+- (void)selectionChanged;
+- (void)setGestureRecognizers;
+- (void)willStartScrollingOrZoomingPage;
+- (void)willStartScrollingOverflow;
+#if !PLATFORM(IOSMAC)
+@property (nonatomic, retain) UIWebSelectionView *selectionView;
+#endif
+@property (nonatomic, readonly) CGRect selectionFrame;
 @end
 
@@ -564 +587 @@
     UIWKGestureTwoFingerRangedSelectGesture = 11,
     UIWKGestureTapOnLinkWithGesture = 12,
+    UIWKGestureMakeWebSelection = 13,
     UIWKGesturePhraseBoundary = 14,
 };
 
-@interface UIWebSelectionAssistant : NSObject
-@end
-
 @interface UIWKSelectionAssistant : UIWebSelectionAssistant
 @end
 
 @interface UIWKSelectionAssistant ()
-- (id)initWithView:(UIView *)view;
+- (BOOL)shouldHandleSingleTapAtPoint:(CGPoint)point;
+- (void)selectionChangedWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)gestureState withFlags:(UIWKSelectionFlags)flags;
+- (void)selectionChangedWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch withFlags:(UIWKSelectionFlags)flags;
+- (void)showDictionaryFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
 - (void)showShareSheetFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
+- (void)showTextServiceFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
+- (void)lookup:(NSString *)textWithContext withRange:(NSRange)range fromRect:(CGRect)presentationRect;
+@property (nonatomic, readonly) UILongPressGestureRecognizer *selectionLongPressRecognizer;
 @end
 

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

@@ -43 +43 @@
     TwoFingerRangedSelectGesture,
     TapOnLinkWithGesture,
+    MakeWebSelection,
     PhraseBoundary
 };

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

@@ -3279 +3279 @@
     case UIWKGestureTapOnLinkWithGesture:
         return WebKit::GestureType::TapOnLinkWithGesture;
+    case UIWKGestureMakeWebSelection:
+        return WebKit::GestureType::MakeWebSelection;
     case UIWKGesturePhraseBoundary:
         return WebKit::GestureType::PhraseBoundary;
@@ -3315 +3317 @@
     case WebKit::GestureType::TapOnLinkWithGesture:
         return UIWKGestureTapOnLinkWithGesture;
+    case WebKit::GestureType::MakeWebSelection:
+        return UIWKGestureMakeWebSelection;
     case WebKit::GestureType::PhraseBoundary:
         return UIWKGesturePhraseBoundary;

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

@@ -523 +523 @@
 - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant shareElementWithURL:(NSURL *)url rect:(CGRect)boundingRect
 {
-    // FIXME: We should use WKShareSheet instead of UIWKSelectionAssistant for this.
     auto selectionAssistant = adoptNS([[UIWKSelectionAssistant alloc] initWithView:[_hostViewController view]]);
     [selectionAssistant showShareSheetFor:WTF::userVisibleString(url) fromRect:boundingRect];

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1239 +1239 @@
 
     static void convertSelectionRectsToRootView(WebCore::FrameView*, Vector<WebCore::SelectionRect>&);
+    RefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, SelectionFlags&);
     void getFocusedElementInformation(FocusedElementInformation&);
     void platformInitializeAccessibility();
@@ -1850 +1851 @@
     RefPtr<WebCore::Range> m_initialSelection;
     WebCore::VisibleSelection m_storedSelectionForAccessibility { WebCore::VisibleSelection() };
+    WebCore::IntSize m_blockSelectionDesiredSize;
     WebCore::FloatSize m_maximumUnobscuredSize;
     int32_t m_deviceOrientation { 0 };

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

@@ -134 +134 @@
 using namespace WebCore;
 
+const int blockSelectionStartWidth = 100;
+const int blockSelectionStartHeight = 100;
+
 void WebPage::platformInitialize()
 {
@@ -1231 +1234 @@
     }
     return boundingRect;
+}
+
+static bool canShrinkToTextSelection(Node* node)
+{
+    if (node && !is<Element>(*node))
+        node = node->parentElement();
+    
+    auto* renderer = (node) ? node->renderer() : nullptr;
+    return renderer && renderer->childrenInline() && (is<RenderBlock>(*renderer) && !downcast<RenderBlock>(*renderer).inlineContinuation()) && !renderer->isTable();
+}
+
+static bool hasCustomLineHeight(Node& node)
+{
+    auto* renderer = node.renderer();
+    return renderer && renderer->style().lineHeight().isSpecified();
+}
+    
+RefPtr<Range> WebPage::rangeForWebSelectionAtPosition(const IntPoint& point, const VisiblePosition& position, SelectionFlags& flags)
+{
+    HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
+
+    Node* currentNode = result.innerNode();
+    if (!currentNode)
+        return nullptr;
+    RefPtr<Range> range;
+    FloatRect boundingRectInScrollViewCoordinates;
+
+    if (!currentNode->isTextNode() && !canShrinkToTextSelection(currentNode) && hasCustomLineHeight(*currentNode)) {
+        auto* renderer = currentNode->renderer();
+        if (is<RenderBlockFlow>(renderer)) {
+            auto* renderText = downcast<RenderBlockFlow>(*renderer).findClosestTextAtAbsolutePoint(point);
+            if (renderText && renderText->textNode())
+                currentNode = renderText->textNode();
+        }
+    }
+
+    if (currentNode->isTextNode()) {
+        range = enclosingTextUnitOfGranularity(position, ParagraphGranularity, DirectionForward);
+        if (!range || range->collapsed())
+            range = Range::create(currentNode->document(), position, position);
+        else {
+            m_blockRectForTextSelection = selectionBoxForRange(range.get());
+            range = wordRangeFromPosition(position);
+        }
+
+        return range;
+    }
+
+    if (!currentNode->isElementNode())
+        currentNode = currentNode->parentElement();
+
+    Node* bestChoice = currentNode;
+    while (currentNode) {
+        if (currentNode->renderer()) {
+            boundingRectInScrollViewCoordinates = currentNode->renderer()->absoluteBoundingBoxRect(true);
+            boundingRectInScrollViewCoordinates.scale(m_page->pageScaleFactor());
+            if (boundingRectInScrollViewCoordinates.width() > m_blockSelectionDesiredSize.width() && boundingRectInScrollViewCoordinates.height() > m_blockSelectionDesiredSize.height())
+                break;
+            bestChoice = currentNode;
+        }
+        currentNode = currentNode->parentElement();
+    }
+
+    if (!bestChoice)
+        return nullptr;
+
+    RenderObject* renderer = bestChoice->renderer();
+    if (!renderer || renderer->style().userSelect() == UserSelect::None)
+        return nullptr;
+
+    if (renderer->childrenInline() && (is<RenderBlock>(*renderer) && !downcast<RenderBlock>(*renderer).inlineContinuation()) && !renderer->isTable()) {
+        range = enclosingTextUnitOfGranularity(position, WordGranularity, DirectionBackward);
+        if (range && !range->collapsed())
+            return range;
+    }
+
+    // If all we could find is a block whose height is very close to the height
+    // of the visible area, don't use it.
+    const float adjustmentFactor = .97;
+    boundingRectInScrollViewCoordinates = renderer->absoluteBoundingBoxRect(true);
+
+    if (boundingRectInScrollViewCoordinates.height() > m_page->mainFrame().view()->exposedContentRect().height() * adjustmentFactor)
+        return nullptr;
+
+    range = Range::create(bestChoice->document());
+    range->selectNodeContents(*bestChoice);
+    return range->collapsed() ? nullptr : range;
 }
 
@@ -1376 +1466 @@
         break;
 
+    case GestureType::MakeWebSelection:
+        if (wkGestureState == GestureRecognizerState::Began) {
+            m_blockSelectionDesiredSize.setWidth(blockSelectionStartWidth);
+            m_blockSelectionDesiredSize.setHeight(blockSelectionStartHeight);
+        }
+        range = rangeForWebSelectionAtPosition(point, position, flags);
+        break;
+
     default:
         break;
@@ -1959 +2057 @@
     RefPtr<Range> range = rangeForGranularityAtPoint(frame, point, granularity, isInteractingWithFocusedElement);
     if (!isInteractingWithFocusedElement) {
+        m_blockSelectionDesiredSize.setWidth(blockSelectionStartWidth);
+        m_blockSelectionDesiredSize.setHeight(blockSelectionStartHeight);
         auto* renderer = range ? range->startContainer().renderer() : nullptr;
         if (renderer && renderer->style().preserveNewline())