Title: [269529] trunk/Source/WebKit
- Revision
- 269529
- Author
- achristen...@apple.com
- Date
- 2020-11-06 12:21:44 -0800 (Fri, 06 Nov 2020)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (269528 => 269529)
--- trunk/Source/WebKit/ChangeLog 2020-11-06 20:17:03 UTC (rev 269528)
+++ trunk/Source/WebKit/ChangeLog 2020-11-06 20:21:44 UTC (rev 269529)
@@ -1,3 +1,19 @@
+2020-11-06 Alex Christensen <achristen...@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_hs...@apple.com>
Encoding PutImageData should not serialize separate IPC attachments for the image data
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.mm (269528 => 269529)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.mm 2020-11-06 20:17:03 UTC (rev 269528)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.mm 2020-11-06 20:21:44 UTC (rev 269529)
@@ -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 @@
return nil;
}
-- (WKWebView *)inspectorWebView
-{
- if (auto* page = _inspector->inspectorPage())
- return fromWebPageProxy(*page);
- return nil;
-}
-
- (BOOL)isConnected
{
return _inspector->isConnected();
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h (269528 => 269529)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h 2020-11-06 20:17:03 UTC (rev 269528)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h 2020-11-06 20:21:44 UTC (rev 269529)
@@ -27,4 +27,5 @@
@interface _WKInspector (WKTesting)
- (void)_openURLExternallyForTesting:(NSURL *)url useFrontendAPI:(BOOL)useFrontendAPI;
+- (WKWebView *)inspectorWebView;
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorTesting.mm (269528 => 269529)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorTesting.mm 2020-11-06 20:17:03 UTC (rev 269528)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorTesting.mm 2020-11-06 20:21:44 UTC (rev 269529)
@@ -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)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h (269528 => 269529)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h 2020-11-06 20:17:03 UTC (rev 269528)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h 2020-11-06 20:21:44 UTC (rev 269529)
@@ -23,8 +23,11 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import "WKObject.h"
#import "_WKUserContentWorld.h"
+#import <wtf/RetainPtr.h>
+
@class WKContentWorld;
@interface _WKUserContentWorld () <WKObject> {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
