Changeset 200972 in webkit

Timestamp:

May 16, 2016, 3:20:16 PM (9 years ago)

Author:

enrica@apple.com

Message:

Text selection is basically impossible on plain text pages.
​https://bugs.webkit.org/show_bug.cgi?id=157681
rdar://problem/26065660

Reviewed by Darin Adler.

When dealing with a plain text file, the rules for deciding whether
a position is selectable should be different and we should never
switch to block selection.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::shouldSwitchToBlockModeForHandle):
(WebKit::rectIsTooBigForSelection): Added helper function.
(WebKit::WebPage::selectTextWithGranularityAtPoint):
(WebKit::WebPage::getPositionInformation):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-13  Enrica Casucci  <enrica@apple.com>
+
+        Text selection is basically impossible on plain text pages.
+        https://bugs.webkit.org/show_bug.cgi?id=157681
+        rdar://problem/26065660
+
+        Reviewed by Darin Adler.
+
+        When dealing with a plain text file, the rules for deciding whether
+        a position is selectable should be different and we should never
+        switch to block selection.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::shouldSwitchToBlockModeForHandle):
+        (WebKit::rectIsTooBigForSelection): Added helper function.
+        (WebKit::WebPage::selectTextWithGranularityAtPoint):
+        (WebKit::WebPage::getPositionInformation):
+
 2016-05-16  Chelsea Pugh  <cpugh@apple.com>
 

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

@@ -1659 +1659 @@
 bool WebPage::shouldSwitchToBlockModeForHandle(const IntPoint& handlePoint, SelectionHandlePosition handlePosition)
 {
+    if (!m_blockRectForTextSelection.height())
+        return false;
     switch (handlePosition) {
     case SelectionHandlePosition::Top:
@@ -1860 +1862 @@
 }
 
+static inline bool rectIsTooBigForSelection(const IntRect& blockRect, const Frame& frame)
+{
+    const float factor = 0.97;
+    return blockRect.height() > frame.view()->unobscuredContentRect().height() * factor;
+}
+
 void WebPage::selectTextWithGranularityAtPoint(const WebCore::IntPoint& point, uint32_t granularity, bool isInteractingWithAssistedNode, uint64_t callbackID)
 {
@@ -1868 +1876 @@
         m_blockSelectionDesiredSize.setHeight(blockSelectionStartHeight);
         m_currentBlockSelection = nullptr;
-        RefPtr<Range> paragraphRange = enclosingTextUnitOfGranularity(visiblePositionInFocusedNodeForPoint(frame, point, isInteractingWithAssistedNode), ParagraphGranularity, DirectionForward);
-        if (paragraphRange && !paragraphRange->collapsed())
-            m_blockRectForTextSelection = selectionBoxForRange(paragraphRange.get());
+        auto* renderer = range->startContainer().renderer();
+        if (renderer->style().preserveNewline())
+            m_blockRectForTextSelection = renderer->absoluteBoundingBoxRect(true);
+        else {
+            auto* paragraphRange = enclosingTextUnitOfGranularity(visiblePositionInFocusedNodeForPoint(frame, point, isInteractingWithAssistedNode), ParagraphGranularity, DirectionForward).get();
+            if (paragraphRange && !paragraphRange->collapsed())
+                m_blockRectForTextSelection = selectionBoxForRange(paragraphRange);
+        }
+        
+        if (rectIsTooBigForSelection(m_blockRectForTextSelection, frame))
+            m_blockRectForTextSelection.setHeight(0);
     }
 
@@ -2389 +2405 @@
                     info.url = downcast<HTMLAttachmentElement>(*hitNode).file()->path();
             } else {
-                const static CGFloat factor = 0.97;
-                info.isSelectable = renderer->style().userSelect() != SELECT_NONE && info.bounds.height() < result.innerNodeFrame()->view()->unobscuredContentRect().height() * factor;
+                info.isSelectable = renderer->style().userSelect() != SELECT_NONE;
+                if (info.isSelectable && !hitNode->isTextNode())
+                    info.isSelectable = !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame());
             }
         }