Changeset 269529 in webkit

Timestamp:

Nov 6, 2020 12:21:44 PM (3 years ago)

Author:

achristensen@apple.com

Message:

Fix build after adding files to UIProcess/API/Cocoa
​https://bugs.webkit.org/show_bug.cgi?id=218664

There is some code that assumes that unified sources always combine sources into the same translation units.
inspectorWebView is used from _WKInspectorTesting.mm, but only defined in _WKInspector.mm so it should be added to a header.
_WKUserContentWorld also doesn't include WKObject.h or RetainPtr.h but uses both.

• UIProcess/API/Cocoa/_WKInspector.mm:

(-[_WKInspector inspectorWebView]): Deleted.

• UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h:
• UIProcess/API/Cocoa/_WKInspectorTesting.mm:

(-[_WKInspector inspectorWebView]):

• UIProcess/API/Cocoa/_WKUserContentWorldInternal.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKInspector.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKInspectorTesting.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKUserContentWorldInternal.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-06  Alex Christensen  <achristensen@webkit.org>
+
+        Fix build after adding files to UIProcess/API/Cocoa
+        https://bugs.webkit.org/show_bug.cgi?id=218664
+
+        There is some code that assumes that unified sources always combine sources into the same translation units.
+        inspectorWebView is used from _WKInspectorTesting.mm, but only defined in _WKInspector.mm so it should be added to a header.
+        _WKUserContentWorld also doesn't include WKObject.h or RetainPtr.h but uses both.
+
+        * UIProcess/API/Cocoa/_WKInspector.mm:
+        (-[_WKInspector inspectorWebView]): Deleted.
+        * UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h:
+        * UIProcess/API/Cocoa/_WKInspectorTesting.mm:
+        (-[_WKInspector inspectorWebView]):
+        * UIProcess/API/Cocoa/_WKUserContentWorldInternal.h:
+
 2020-11-06  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.mm

@@ -32 +32 @@
 #import "WebProcessProxy.h"
 #import "_WKFrameHandleInternal.h"
+#import "_WKInspectorPrivateForTesting.h"
 #import <WebCore/FrameIdentifier.h>
 #import <wtf/HashMap.h>
@@ -59 +60 @@
 {
     if (auto* page = _inspector->inspectedPage())
-        return fromWebPageProxy(*page);
-    return nil;
-}
-
-- (WKWebView *)inspectorWebView
-{
-    if (auto* page = _inspector->inspectorPage())
         return fromWebPageProxy(*page);
     return nil;

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h

@@ -28 +28 @@
 @interface _WKInspector (WKTesting)
 - (void)_openURLExternallyForTesting:(NSURL *)url useFrontendAPI:(BOOL)useFrontendAPI;
+- (WKWebView *)inspectorWebView;
 @end

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorTesting.mm

@@ -26 +26 @@
 #import "config.h"
 
-#import "WKWebView.h"
+#import "WKWebViewInternal.h"
 #import "_WKInspectorInternal.h"
 #import "_WKInspectorPrivateForTesting.h"
@@ -40 +40 @@
 @implementation _WKInspector (WKTesting)
 
+- (WKWebView *)inspectorWebView
+{
+    if (auto* page = _inspector->inspectorPage())
+        return fromWebPageProxy(*page);
+    return nil;
+}
+
 - (void)_openURLExternallyForTesting:(NSURL *)url useFrontendAPI:(BOOL)useFrontendAPI
 {

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h

@@ -24 +24 @@
  */
 
+#import "WKObject.h"
 #import "_WKUserContentWorld.h"
+
+#import <wtf/RetainPtr.h>
 
 @class WKContentWorld;