Title: [270996] trunk/Source/WebKit
Revision
270996
Author
[email protected]
Date
2020-12-18 16:16:08 -0800 (Fri, 18 Dec 2020)

Log Message

[Cocoa] Web Inspector: clean up _WKRemoteWebInspectorViewController
https://bugs.webkit.org/show_bug.cgi?id=219963

Reviewed by Devin Rousso.

Remove deprecated and unused debuggableType-based SPI to load the frontend.

* UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h:
* UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerPrivate.h:
Promote the _WKInspectorDebuggableInfo-based SPI to the main header.
Fix availability annotations. This class has never worked on iOS.
Add TBA annotations for things added since the Big Sur SDK was finalized.

* UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm:
(legacyDebuggableTypeToModernDebuggableType): Deleted.
(-[_WKRemoteWebInspectorViewController loadForDebuggableType:backendCommandsURL:]): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (270995 => 270996)


--- trunk/Source/WebKit/ChangeLog	2020-12-19 00:11:41 UTC (rev 270995)
+++ trunk/Source/WebKit/ChangeLog	2020-12-19 00:16:08 UTC (rev 270996)
@@ -1,3 +1,22 @@
+2020-12-18  BJ Burg  <[email protected]>
+
+        [Cocoa] Web Inspector: clean up _WKRemoteWebInspectorViewController
+        https://bugs.webkit.org/show_bug.cgi?id=219963
+
+        Reviewed by Devin Rousso.
+
+        Remove deprecated and unused debuggableType-based SPI to load the frontend.
+
+        * UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h:
+        * UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerPrivate.h:
+        Promote the _WKInspectorDebuggableInfo-based SPI to the main header.
+        Fix availability annotations. This class has never worked on iOS.
+        Add TBA annotations for things added since the Big Sur SDK was finalized.
+
+        * UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm:
+        (legacyDebuggableTypeToModernDebuggableType): Deleted.
+        (-[_WKRemoteWebInspectorViewController loadForDebuggableType:backendCommandsURL:]): Deleted.
+
 2020-12-18  Peng Liu  <[email protected]>
 
         [Media in GPU Process][MSE] SourceBufferPrivateRemote needs to override some track buffer related functions of SourceBufferPrivate

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h (270995 => 270996)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h	2020-12-19 00:11:41 UTC (rev 270995)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h	2020-12-19 00:16:08 UTC (rev 270996)
@@ -30,21 +30,13 @@
 
 @class WKWebView;
 @class _WKInspectorConfiguration;
+@class _WKInspectorDebuggableInfo;
 
 @protocol _WKRemoteWebInspectorViewControllerDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_ENUM(NSInteger, WKRemoteWebInspectorDebuggableType) {
-    WKRemoteWebInspectorDebuggableTypeITML WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)),
-    WKRemoteWebInspectorDebuggableTypeJavaScript,
-    WKRemoteWebInspectorDebuggableTypeServiceWorker WK_API_AVAILABLE(macos(10.13.4), ios(11.3)),
-    WKRemoteWebInspectorDebuggableTypeWeb WK_API_DEPRECATED("Split into Page and WebPage", macos(10.12.3, WK_MAC_TBA), ios(10.3, WK_IOS_TBA)),
-    WKRemoteWebInspectorDebuggableTypePage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)),
-    WKRemoteWebInspectorDebuggableTypeWebPage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)),
-} WK_API_AVAILABLE(macos(10.12.3), ios(10.3));
-
-WK_CLASS_AVAILABLE(macos(10.12.3), ios(10.3))
+WK_CLASS_AVAILABLE(macos(10.12.3))
 @interface _WKRemoteWebInspectorViewController : NSObject <_WKInspectorExtensionHost>
 
 @property (nonatomic, assign) id <_WKRemoteWebInspectorViewControllerDelegate> delegate;
@@ -51,10 +43,10 @@
 
 @property (nonatomic, readonly, retain) NSWindow *window;
 @property (nonatomic, readonly, retain) WKWebView *webView;
-@property (nonatomic, readonly, copy) _WKInspectorConfiguration *configuration;
+@property (nonatomic, readonly, copy) _WKInspectorConfiguration *configuration WK_API_AVAILABLE(macos(WK_MAC_TBA));
 
-- (instancetype)initWithConfiguration:(_WKInspectorConfiguration *)configuration;
-- (void)loadForDebuggableType:(WKRemoteWebInspectorDebuggableType)debuggableType backendCommandsURL:(NSURL *)backendCommandsURL;
+- (instancetype)initWithConfiguration:(_WKInspectorConfiguration *)configuration WK_API_AVAILABLE(macos(WK_MAC_TBA));
+- (void)loadForDebuggable:(_WKInspectorDebuggableInfo *)debuggableInfo backendCommandsURL:(NSURL *)backendCommandsURL WK_API_AVAILABLE(macos(WK_MAC_TBA));
 - (void)close;
 - (void)show;
 

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm (270995 => 270996)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm	2020-12-19 00:11:41 UTC (rev 270995)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm	2020-12-19 00:16:08 UTC (rev 270996)
@@ -115,38 +115,6 @@
     return m_remoteInspectorProxy->webView();
 }
 
-static _WKInspectorDebuggableType legacyDebuggableTypeToModernDebuggableType(WKRemoteWebInspectorDebuggableType debuggableType)
-{
-    switch (debuggableType) {
-    case WKRemoteWebInspectorDebuggableTypeITML:
-        return _WKInspectorDebuggableTypeITML;
-    case WKRemoteWebInspectorDebuggableTypeJavaScript:
-        return _WKInspectorDebuggableTypeJavaScript;
-    case WKRemoteWebInspectorDebuggableTypePage:
-        return _WKInspectorDebuggableTypePage;
-    case WKRemoteWebInspectorDebuggableTypeServiceWorker:
-        return _WKInspectorDebuggableTypeServiceWorker;
-    case WKRemoteWebInspectorDebuggableTypeWebPage:
-        return _WKInspectorDebuggableTypeWebPage;
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    case WKRemoteWebInspectorDebuggableTypeWeb:
-        return _WKInspectorDebuggableTypeWebPage;
-ALLOW_DEPRECATED_DECLARATIONS_END
-    }
-}
-
-// FIXME: remove this variant when all callers have moved off of it.
-- (void)loadForDebuggableType:(WKRemoteWebInspectorDebuggableType)debuggableType backendCommandsURL:(NSURL *)backendCommandsURL
-{
-    _WKInspectorDebuggableInfo *debuggableInfo = [_WKInspectorDebuggableInfo new];
-    debuggableInfo.debuggableType = legacyDebuggableTypeToModernDebuggableType(debuggableType);
-    debuggableInfo.targetPlatformName = @"macOS";
-    debuggableInfo.targetBuildVersion = @"Unknown";
-    debuggableInfo.targetProductVersion = @"Unknown";
-    debuggableInfo.targetIsSimulator = NO;
-    [self loadForDebuggable:debuggableInfo backendCommandsURL:backendCommandsURL];
-}
-
 - (void)loadForDebuggable:(_WKInspectorDebuggableInfo *)debuggableInfo backendCommandsURL:(NSURL *)backendCommandsURL
 {
     m_remoteInspectorProxy->load(static_cast<API::DebuggableInfo&>([debuggableInfo _apiObject]), backendCommandsURL.absoluteString);

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerPrivate.h (270995 => 270996)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerPrivate.h	2020-12-19 00:11:41 UTC (rev 270995)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerPrivate.h	2020-12-19 00:16:08 UTC (rev 270996)
@@ -36,8 +36,6 @@
 
 @property (nonatomic, weak, setter=_setDiagnosticLoggingDelegate:) id<_WKDiagnosticLoggingDelegate> _diagnosticLoggingDelegate;
 
-- (void)loadForDebuggable:(_WKInspectorDebuggableInfo *)debuggableInfo backendCommandsURL:(NSURL *)backendCommandsURL;
-
 @end
 
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to