Fix build after adding files to UIProcess/API/Cocoa

achristensen07 · achristensen07 · commit 7d3699b80861 · 2020-11-06T20:21:44.000Z
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: Canonical link: https://commits.webkit.org/231324@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269529 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+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>
 
         Encoding PutImageData should not serialize separate IPC attachments for the image data
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.mm
@@ -31,6 +31,7 @@
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
 #import "_WKFrameHandleInternal.h"
+#import "_WKInspectorPrivateForTesting.h"
 #import <WebCore/FrameIdentifier.h>
 #import <wtf/HashMap.h>
 #import <wtf/HashSet.h>
@@ -62,13 +63,6 @@ - (WKWebView *)webView
     return nil;
 }
 
-- (WKWebView *)inspectorWebView
-{
-    if (auto* page = _inspector->inspectorPage())
-        return fromWebPageProxy(*page);
-    return nil;
-}
-
 - (BOOL)isConnected
 {
     return _inspector->isConnected();
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h
@@ -27,4 +27,5 @@
 
 @interface _WKInspector (WKTesting)
 - (void)_openURLExternallyForTesting:(NSURL *)url useFrontendAPI:(BOOL)useFrontendAPI;
+- (WKWebView *)inspectorWebView;
 @end
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorTesting.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorTesting.mm
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#import "WKWebView.h"
+#import "WKWebViewInternal.h"
 #import "_WKInspectorInternal.h"
 #import "_WKInspectorPrivateForTesting.h"
 
@@ -39,6 +39,13 @@
 
 @implementation _WKInspector (WKTesting)
 
+- (WKWebView *)inspectorWebView
+{
+    if (auto* page = _inspector->inspectorPage())
+        return fromWebPageProxy(*page);
+    return nil;
+}
+
 - (void)_openURLExternallyForTesting:(NSURL *)url useFrontendAPI:(BOOL)useFrontendAPI
 {
     if (useFrontendAPI)
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h b/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h
@@ -23,8 +23,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "WKObject.h"
 #import "_WKUserContentWorld.h"
 
+#import <wtf/RetainPtr.h>
+
 @class WKContentWorld;
 
 @interface _WKUserContentWorld () <WKObject> {
