Changeset 265174 in webkit

Timestamp:

Aug 1, 2020 1:02:05 AM (4 years ago)

Author:

Megan Gardner

Message:

Unable to select multiple lines of vertical text correctly
​https://bugs.webkit.org/show_bug.cgi?id=213671
<rdar://problem/53753636>

Reviewed by Darin Adler.

In order to make for a better text selection experience, we pulled the selection position
down to be on the last line selectable, rather than snap the selection to a single position.
This made for a better selection experience on small text, but we failed to take
vertical text into account, and a user is locked into only selecting vertical text that ends below the
other anchor point of the selection. We should have the same behavior for vertical text, but correctly
calculated for X instead of Y.
This does not fix all cases, but it fixes the most glaring cases.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::rangeForPointInRootViewCoordinates):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-08-01  Megan Gardner  <megan_gardner@apple.com>
+
+        Unable to select multiple lines of vertical text correctly
+        https://bugs.webkit.org/show_bug.cgi?id=213671
+        <rdar://problem/53753636>
+
+        Reviewed by Darin Adler.
+
+        In order to make for a better text selection experience, we pulled the selection position 
+        down to be on the last line selectable, rather than snap the selection to a single position.
+        This made for a better selection experience on small text, but we failed to take
+        vertical text into account, and a user is locked into only selecting vertical text that ends below the
+        other anchor point of the selection. We should have the same behavior for vertical text, but correctly 
+        calculated for X instead of Y.
+        This does not fix all cases, but it fixes the most glaring cases.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::rangeForPointInRootViewCoordinates):
+
 2020-07-31  Jer Noble  <jer.noble@apple.com>
 

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

@@ -108 +108 @@
 #import <WebCore/Node.h>
 #import <WebCore/NodeList.h>
+#import <WebCore/NodeRenderStyle.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/Page.h>
@@ -1494 +1495 @@
     auto pointInDocument = frame.view()->rootViewToContents(pointInRootViewCoordinates);
 
-    if (baseIsStart) {
-        int startY = selectionStart.absoluteCaretBounds().center().y();
-        if (pointInDocument.y() < startY)
-            pointInDocument.setY(startY);
+    auto node = selectionStart.deepEquivalent().containerNode();
+    if (node && node->renderStyle() && node->renderStyle()->isVerticalWritingMode()) {
+        if (baseIsStart) {
+            int startX = selectionStart.absoluteCaretBounds().center().x();
+            if (pointInDocument.x() > startX)
+                pointInDocument.setX(startX);
+        } else {
+            int endX = selectionEnd.absoluteCaretBounds().center().x();
+            if (pointInDocument.x() < endX)
+                pointInDocument.setX(endX);
+        }
     } else {
-        int endY = selectionEnd.absoluteCaretBounds().center().y();
-        if (pointInDocument.y() > endY)
-            pointInDocument.setY(endY);
+        if (baseIsStart) {
+            int startY = selectionStart.absoluteCaretBounds().center().y();
+            if (pointInDocument.y() < startY)
+                pointInDocument.setY(startY);
+        } else {
+            int endY = selectionEnd.absoluteCaretBounds().center().y();
+            if (pointInDocument.y() > endY)
+                pointInDocument.setY(endY);
+        }
     }