Title: [255879] trunk/Source/WebKit
- Revision
- 255879
- Author
- [email protected]
- Date
- 2020-02-05 16:52:00 -0800 (Wed, 05 Feb 2020)
Log Message
[macCatalyst] Incorrect IBeam cursor when selecting text on Wikipedia
https://bugs.webkit.org/show_bug.cgi?id=207299
<rdar://problem/59200545>
Reviewed by Tim Horton.
After r255827, if EventHandler selects an IBeam cursor at the position information request location, we will
always attempt to show a caret at that location, whose height is the height of the editing caret for that
visible position. However, this means that:
- It's possible for the caret to be incorrectly sized if the caret is before a large replaced element, such as
a table. Since the request location is also outside of any line rect, it doesn't make sense to use the caret
height for the height of the cursor. Instead, fall back to computed line height. This fixes an issue on
en.wikipedia.org where the line rect would sometimes update to an enormous size when selecting text, since
the caret would temporarily hover over an editing position that is before a large table.
- This fallback path completely negates certain cursor behaviors; partially restore this behavior by making it
so that in the case where the cursor is in editable content and the line caret first line from the top of
the hit-tested node already contains the request point, don't bother trying to recenter the line rect to be
right over the request point.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::populateCaretContext):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (255878 => 255879)
--- trunk/Source/WebKit/ChangeLog 2020-02-06 00:30:05 UTC (rev 255878)
+++ trunk/Source/WebKit/ChangeLog 2020-02-06 00:52:00 UTC (rev 255879)
@@ -1,3 +1,29 @@
+2020-02-05 Wenson Hsieh <[email protected]>
+
+ [macCatalyst] Incorrect IBeam cursor when selecting text on Wikipedia
+ https://bugs.webkit.org/show_bug.cgi?id=207299
+ <rdar://problem/59200545>
+
+ Reviewed by Tim Horton.
+
+ After r255827, if EventHandler selects an IBeam cursor at the position information request location, we will
+ always attempt to show a caret at that location, whose height is the height of the editing caret for that
+ visible position. However, this means that:
+
+ - It's possible for the caret to be incorrectly sized if the caret is before a large replaced element, such as
+ a table. Since the request location is also outside of any line rect, it doesn't make sense to use the caret
+ height for the height of the cursor. Instead, fall back to computed line height. This fixes an issue on
+ en.wikipedia.org where the line rect would sometimes update to an enormous size when selecting text, since
+ the caret would temporarily hover over an editing position that is before a large table.
+
+ - This fallback path completely negates certain cursor behaviors; partially restore this behavior by making it
+ so that in the case where the cursor is in editable content and the line caret first line from the top of
+ the hit-tested node already contains the request point, don't bother trying to recenter the line rect to be
+ right over the request point.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::populateCaretContext):
+
2020-02-05 Chris Dumez <[email protected]>
Regression(r248734) StorageAreaMap objects are getting leaked
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (255878 => 255879)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-02-06 00:30:05 UTC (rev 255878)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-02-06 00:52:00 UTC (rev 255879)
@@ -2797,7 +2797,11 @@
if (!view)
return;
- auto* renderer = hitTestResult.innerNode()->renderer();
+ auto node = hitTestResult.innerNode();
+ if (!node)
+ return;
+
+ auto* renderer = node->renderer();
if (!renderer)
return;
@@ -2824,9 +2828,10 @@
if (!lineContainsRequestPoint && info.cursor->type() == Cursor::IBeam) {
auto approximateLineRectInContentCoordinates = renderer->absoluteBoundingBoxRect();
- approximateLineRectInContentCoordinates.setHeight(position.absoluteCaretBounds().height());
+ approximateLineRectInContentCoordinates.setHeight(renderer->style().computedLineHeight());
info.lineCaretExtent = view->contentsToRootView(approximateLineRectInContentCoordinates);
- info.lineCaretExtent.setY(request.point.y() - info.lineCaretExtent.height() / 2);
+ if (!info.lineCaretExtent.contains(request.point) || !node->hasEditableStyle())
+ info.lineCaretExtent.setY(request.point.y() - info.lineCaretExtent.height() / 2);
info.caretHeight = info.lineCaretExtent.height();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
