Title: [294285] trunk
- Revision
- 294285
- Author
- wenson_hs...@apple.com
- Date
- 2022-05-16 20:29:53 -0700 (Mon, 16 May 2022)
Log Message
Demote -[WKWebView retrieveAccessibilityTreeData:] to SPI
https://bugs.webkit.org/show_bug.cgi?id=240494
rdar://93385094
Reviewed by Tim Horton.
This method was only intended for use in MiniBrowser, and should ship as public API on WKWebView. Move the
declaration and implementation of this over to WKWebViewPrivateForTestingMac.h and WKWebViewTestingMac.mm
(respectively), and additionally prefix this testing-only SPI with an underscore.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView retrieveAccessibilityTreeData:]): Deleted.
* UIProcess/API/mac/WKWebViewPrivateForTestingMac.h:
* UIProcess/API/mac/WKWebViewTestingMac.mm:
(-[WKWebView _retrieveAccessibilityTreeData:]):
Demote -[WKWebView retrieveAccessibilityTreeData:] to SPI
https://bugs.webkit.org/show_bug.cgi?id=240494
rdar://93385094
Reviewed by Tim Horton.
See WebKit/ChangeLog for more details.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController logAccessibilityTrees:]):
Canonical link: https://commits.webkit.org/250629@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (294284 => 294285)
--- trunk/Source/WebKit/ChangeLog 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Source/WebKit/ChangeLog 2022-05-17 03:29:53 UTC (rev 294285)
@@ -1,3 +1,22 @@
+2022-05-16 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Demote -[WKWebView retrieveAccessibilityTreeData:] to SPI
+ https://bugs.webkit.org/show_bug.cgi?id=240494
+ rdar://93385094
+
+ Reviewed by Tim Horton.
+
+ This method was only intended for use in MiniBrowser, and should not ship as public API on WKWebView. Move the
+ declaration and implementation of this over to WKWebViewPrivateForTestingMac.h and WKWebViewTestingMac.mm
+ (respectively), and additionally prefix this testing-only SPI with an underscore.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView retrieveAccessibilityTreeData:]): Deleted.
+ * UIProcess/API/mac/WKWebViewPrivateForTestingMac.h:
+ * UIProcess/API/mac/WKWebViewTestingMac.mm:
+ (-[WKWebView _retrieveAccessibilityTreeData:]):
+
2022-05-16 Said Abou-Hallawa <s...@apple.com>
REGRESSION(r249162): CanvasRenderingContext2DBase::drawImage() crashes if the image is animated and the first frame cannot be decoded
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (294284 => 294285)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2022-05-17 03:29:53 UTC (rev 294285)
@@ -449,8 +449,6 @@
*/
- (void)createWebArchiveDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler NS_REFINED_FOR_SWIFT WK_API_AVAILABLE(macos(11.0), ios(14.0));
-- (void)retrieveAccessibilityTreeData:(void (^)(NSData *, NSError *))completionHandler;
-
/*! @abstract A Boolean value indicating whether horizontal swipe gestures
will trigger back-forward list navigations.
@discussion The default value is NO.
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (294284 => 294285)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-05-17 03:29:53 UTC (rev 294285)
@@ -1750,14 +1750,6 @@
});
}
-- (void)retrieveAccessibilityTreeData:(void (^)(NSData *, NSError *))completionHandler
-{
- THROW_IF_SUSPENDED;
- _page->getAccessibilityTreeData([completionHandler = makeBlockPtr(completionHandler)] (API::Data* data) {
- completionHandler(wrapper(data), nil);
- });
-}
-
static NSDictionary *dictionaryRepresentationForEditorState(const WebKit::EditorState& state)
{
if (state.isMissingPostLayoutData)
Modified: trunk/Source/WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h (294284 => 294285)
--- trunk/Source/WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Source/WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h 2022-05-17 03:29:53 UTC (rev 294285)
@@ -53,6 +53,7 @@
- (NSSet<NSView *> *)_pdfHUDs;
- (void)_simulateMouseMove:(NSEvent *)event;
+- (void)_retrieveAccessibilityTreeData:(void (^)(NSData *, NSError *))completionHandler;
@end
Modified: trunk/Source/WebKit/UIProcess/API/mac/WKWebViewTestingMac.mm (294284 => 294285)
--- trunk/Source/WebKit/UIProcess/API/mac/WKWebViewTestingMac.mm 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Source/WebKit/UIProcess/API/mac/WKWebViewTestingMac.mm 2022-05-17 03:29:53 UTC (rev 294285)
@@ -126,6 +126,13 @@
return _impl->mouseMoved(event);
}
+- (void)_retrieveAccessibilityTreeData:(void (^)(NSData *, NSError *))completionHandler
+{
+ _page->getAccessibilityTreeData([completionHandler = makeBlockPtr(completionHandler)] (API::Data* data) {
+ completionHandler(wrapper(data), nil);
+ });
+}
+
@end
#endif // PLATFORM(MAC)
Modified: trunk/Tools/ChangeLog (294284 => 294285)
--- trunk/Tools/ChangeLog 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Tools/ChangeLog 2022-05-17 03:29:53 UTC (rev 294285)
@@ -1,3 +1,16 @@
+2022-05-16 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Demote -[WKWebView retrieveAccessibilityTreeData:] to SPI
+ https://bugs.webkit.org/show_bug.cgi?id=240494
+ rdar://93385094
+
+ Reviewed by Tim Horton.
+
+ See WebKit/ChangeLog for more details.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController logAccessibilityTrees:]):
+
2022-05-16 Brent Fulgham <bfulg...@apple.com>
Remove abandoned UseScreenCaptureKit preference
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (294284 => 294285)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2022-05-17 01:34:39 UTC (rev 294284)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2022-05-17 03:29:53 UTC (rev 294285)
@@ -315,7 +315,7 @@
#pragma clang diagnostic pop
[panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
if (result == NSModalResponseOK) {
- [_webView retrieveAccessibilityTreeData:^(NSData *data, NSError *error) {
+ [_webView _retrieveAccessibilityTreeData:^(NSData *data, NSError *error) {
[data writeToURL:[panel URL] options:0 error:nil];
}];
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
