Title: [290797] trunk/Source/WebKit
- Revision
- 290797
- Author
- timothy_hor...@apple.com
- Date
- 2022-03-03 15:25:50 -0800 (Thu, 03 Mar 2022)
Log Message
WKContentView should explicitly request the system pointer in the fallback case
https://bugs.webkit.org/show_bug.cgi?id=237410
<rdar://79198381>
Reviewed by Anders Carlsson.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView pointerRegionForPositionInformation:point:]):
(-[WKContentView pointerInteraction:styleForRegion:]):
Instead of assuming a nil region and nil style will provide the system
pointer, provide a region the size of the WKContentView and explicitly
request the system pointer shape.
Also, drive-by adopt the API `systemPointerStyle` instead of the
deprecated SPI version.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (290796 => 290797)
--- trunk/Source/WebKit/ChangeLog 2022-03-03 22:51:22 UTC (rev 290796)
+++ trunk/Source/WebKit/ChangeLog 2022-03-03 23:25:50 UTC (rev 290797)
@@ -1,3 +1,21 @@
+2022-03-03 Tim Horton <timothy_hor...@apple.com>
+
+ WKContentView should explicitly request the system pointer in the fallback case
+ https://bugs.webkit.org/show_bug.cgi?id=237410
+ <rdar://79198381>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView pointerRegionForPositionInformation:point:]):
+ (-[WKContentView pointerInteraction:styleForRegion:]):
+ Instead of assuming a nil region and nil style will provide the system
+ pointer, provide a region the size of the WKContentView and explicitly
+ request the system pointer shape.
+
+ Also, drive-by adopt the API `systemPointerStyle` instead of the
+ deprecated SPI version.
+
2022-03-03 Chris Dumez <cdu...@apple.com>
[macOS] WebContent processes crash with XPC_EXIT_REASON_SIGTERM_TIMEOUT when logging out
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (290796 => 290797)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2022-03-03 22:51:22 UTC (rev 290796)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2022-03-03 23:25:50 UTC (rev 290797)
@@ -10014,7 +10014,7 @@
return [UIPointerRegion regionWithRect:self.bounds identifier:editablePointerRegionIdentifier];
}
- return nil;
+ return [UIPointerRegion regionWithRect:self.bounds identifier:pointerRegionIdentifier];
}
- (UIPointerStyle *)pointerInteraction:(UIPointerInteraction *)interaction styleForRegion:(UIPointerRegion *)region
@@ -10039,7 +10039,7 @@
if (self.webView._editable) {
if (_positionInformation.shouldNotUseIBeamInEditableContent)
- return nil;
+ return [UIPointerStyle systemPointerStyle];
return iBeamCursor();
}
@@ -10046,17 +10046,14 @@
if (_positionInformation.cursor && [region.identifier isEqual:pointerRegionIdentifier]) {
WebCore::Cursor::Type cursorType = _positionInformation.cursor->type();
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (cursorType == WebCore::Cursor::Hand)
- return [UIPointerStyle _systemPointerStyle];
- ALLOW_DEPRECATED_DECLARATIONS_END
+ return [UIPointerStyle systemPointerStyle];
if (cursorType == WebCore::Cursor::IBeam && _positionInformation.lineCaretExtent.contains(_positionInformation.request.point))
return iBeamCursor();
}
- ASSERT_NOT_REACHED();
- return nil;
+ return [UIPointerStyle systemPointerStyle];
}
#endif // HAVE(UI_POINTER_INTERACTION)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
