Changeset 214174 in webkit

Timestamp:

Mar 20, 2017 10:32:48 AM (7 years ago)

Author:

Wenson Hsieh

Message:

TextIndicator should support a mode where selection rects are used to size the snapshot
​https://bugs.webkit.org/show_bug.cgi?id=169845
<rdar://problem/31127818>

Reviewed by Beth Dakin.

Source/WebCore:

Adds TextIndicator support in iOS for using the would-be selection rects of a given range to determine
snapshotting bounds. See below changes for more details.

• dom/Range.cpp:

(WebCore::Range::collectSelectionRectsWithoutUnionInteriorLines):
(WebCore::Range::collectSelectionRects):

Mark these helper methods as const.

• dom/Range.h:
• page/TextIndicator.cpp:

(WebCore::getSelectionRectsForRange):
(WebCore::initializeIndicator):

If TextIndicatorOptionUseSelectionRectForSizing is enabled, then compute selection rects and set the text rects
to be the resulting selection rects. These are in document coordinates.

• page/TextIndicator.h:

Source/WebKit2:

Adopt the new TextIndicatorOptionUseSelectionRectForSizing flag when generating an edit data interaction snapshot.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::didConcludeEditDataInteraction):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Range.cpp (modified) (2 diffs)
• WebCore/dom/Range.h (modified) (1 diff)
• WebCore/page/TextIndicator.cpp (modified) (3 diffs)
• WebCore/page/TextIndicator.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-20  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        TextIndicator should support a mode where selection rects are used to size the snapshot
+        https://bugs.webkit.org/show_bug.cgi?id=169845
+        <rdar://problem/31127818>
+
+        Reviewed by Beth Dakin.
+
+        Adds TextIndicator support in iOS for using the would-be selection rects of a given range to determine
+        snapshotting bounds. See below changes for more details.
+
+        * dom/Range.cpp:
+        (WebCore::Range::collectSelectionRectsWithoutUnionInteriorLines):
+        (WebCore::Range::collectSelectionRects):
+
+        Mark these helper methods as const.
+
+        * dom/Range.h:
+        * page/TextIndicator.cpp:
+        (WebCore::getSelectionRectsForRange):
+        (WebCore::initializeIndicator):
+
+        If TextIndicatorOptionUseSelectionRectForSizing is enabled, then compute selection rects and set the text rects
+        to be the resulting selection rects. These are in document coordinates.
+
+        * page/TextIndicator.h:
+
 2017-03-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/Range.cpp

@@ -1267 +1267 @@
 // This function is similar in spirit to addLineBoxRects, but annotates the returned rectangles
 // with additional state which helps iOS draw selections in its unique way.
-int Range::collectSelectionRectsWithoutUnionInteriorLines(Vector<SelectionRect>& rects)
+int Range::collectSelectionRectsWithoutUnionInteriorLines(Vector<SelectionRect>& rects) const
 {
     auto& startContainer = this->startContainer();
@@ -1427 +1427 @@
 }
 
-void Range::collectSelectionRects(Vector<SelectionRect>& rects)
+void Range::collectSelectionRects(Vector<SelectionRect>& rects) const
 {
     int maxLineNumber = collectSelectionRectsWithoutUnionInteriorLines(rects);

trunk/Source/WebCore/dom/Range.h

@@ -125 +125 @@
     WEBCORE_EXPORT FloatRect absoluteBoundingRect() const;
 #if PLATFORM(IOS)
-    WEBCORE_EXPORT void collectSelectionRects(Vector<SelectionRect>&);
-    WEBCORE_EXPORT int collectSelectionRectsWithoutUnionInteriorLines(Vector<SelectionRect>&);
+    WEBCORE_EXPORT void collectSelectionRects(Vector<SelectionRect>&) const;
+    WEBCORE_EXPORT int collectSelectionRectsWithoutUnionInteriorLines(Vector<SelectionRect>&) const;
 #endif
 

trunk/Source/WebCore/page/TextIndicator.cpp

@@ -42 +42 @@
 #include "RenderObject.h"
 
+#if PLATFORM(IOS)
+#include "SelectionRect.h"
+#endif
+
 using namespace WebCore;
 
@@ -184 +188 @@
 }
 
+#if PLATFORM(IOS)
+
+static void getSelectionRectsForRange(Vector<FloatRect>& resultingRects, const Range& range)
+{
+    Vector<SelectionRect> selectionRectsForRange;
+    Vector<FloatRect> selectionRectsForRangeInBoundingRectCoordinates;
+    range.collectSelectionRects(selectionRectsForRange);
+    for (auto selectionRect : selectionRectsForRange)
+        resultingRects.append(selectionRect.rect());
+}
+
+#endif
+
 static bool initializeIndicator(TextIndicatorData& data, Frame& frame, const Range& range, FloatSize margin, bool indicatesCurrentSelection)
 {
@@ -198 +215 @@
     if ((data.options & TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges) && hasNonInlineOrReplacedElements(range))
         data.options |= TextIndicatorOptionPaintAllContent;
+#if PLATFORM(IOS)
+    else if (data.options & TextIndicatorOptionUseSelectionRectForSizing)
+        getSelectionRectsForRange(textRects, range);
+#endif
     else {
         if (data.options & TextIndicatorOptionDoNotClipToVisibleRect)

trunk/Source/WebCore/page/TextIndicator.h

@@ -84 +84 @@
     // Include an additional snapshot of everything in view, with the exception of nodes within the currently selected range.
     TextIndicatorOptionIncludeSnapshotOfAllVisibleContentWithoutSelection = 1 << 8,
+
+    // By default, TextIndicator uses text rects to size the snapshot. Enabling this flag causes it to use the bounds of the
+    // selection rects that would enclose the given Range instead.
+    // Currently, this is only supported on iOS.
+    TextIndicatorOptionUseSelectionRectForSizing = 1 << 9,
 };
 typedef uint16_t TextIndicatorOptions;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-03-20  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        TextIndicator should support a mode where selection rects are used to size the snapshot
+        https://bugs.webkit.org/show_bug.cgi?id=169845
+        <rdar://problem/31127818>
+
+        Reviewed by Beth Dakin.
+
+        Adopt the new TextIndicatorOptionUseSelectionRectForSizing flag when generating an edit data interaction snapshot.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::didConcludeEditDataInteraction):
+
 2017-03-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -632 +632 @@
     std::optional<TextIndicatorData> textIndicatorData;
 
-    static auto defaultEditDragTextIndicatorOptions = TextIndicatorOptionIncludeSnapshotOfAllVisibleContentWithoutSelection | TextIndicatorOptionDoNotClipToVisibleRect | TextIndicatorOptionPaintAllContent | TextIndicatorOptionIncludeMarginIfRangeMatchesSelection | TextIndicatorOptionPaintBackgrounds | TextIndicatorOptionIncludeSnapshotWithSelectionHighlight;
+    static auto defaultEditDragTextIndicatorOptions = TextIndicatorOptionIncludeSnapshotOfAllVisibleContentWithoutSelection | TextIndicatorOptionDoNotClipToVisibleRect | TextIndicatorOptionPaintAllContent | TextIndicatorOptionIncludeMarginIfRangeMatchesSelection | TextIndicatorOptionPaintBackgrounds | TextIndicatorOptionUseSelectionRectForSizing | TextIndicatorOptionIncludeSnapshotWithSelectionHighlight;
     auto& frame = m_page->focusController().focusedOrMainFrame();
     if (auto range = frame.selection().selection().toNormalizedRange()) {