Title: [240685] trunk/Source/WebKit
Revision
240685
Author
[email protected]
Date
2019-01-29 14:40:44 -0800 (Tue, 29 Jan 2019)

Log Message

Web Inspector: expose a way of determining if a detached frontend is for a remote target
https://bugs.webkit.org/show_bug.cgi?id=193951
<rdar://problem/47621366>

Reviewed by Joseph Pecoraro.

* UIProcess/WebInspectorProxy.h:
(WebKit::WebInspectorProxy::InspectionTargetType): Added.
(WebKit::WebInspectorProxy::createFrontendWindow):
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createFrontendWindow):
(WebKit::WebInspectorProxy::platformCreateFrontendWindow):
* UIProcess/mac/RemoteWebInspectorProxyMac.mm:
(WebKit::RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow):

* UIProcess/API/Cocoa/_WKInspectorWindow.h: Moved from UIProcess/mac/WKInspectorWindow.h.
* UIProcess/API/Cocoa/_WKInspectorWindow.mm: Moved from UIProcess/mac/WKInspectorWindow.mm.
(-[WKInspectorWindow isRemote]): Added.

* Shared/API/Cocoa/_WKNSWindowExtras.mm:
(-[NSWindow _web_isWebInspectorWindow]):

* PlatformMac.cmake:
* SourcesCocoa.txt:
* UnifiedSources-input.xcfilelist:
* WebKit.xcodeproj/project.pbxproj:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (240684 => 240685)


--- trunk/Source/WebKit/ChangeLog	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/ChangeLog	2019-01-29 22:40:44 UTC (rev 240685)
@@ -1,3 +1,32 @@
+2019-01-29  Devin Rousso  <[email protected]>
+
+        Web Inspector: expose a way of determining if a detached frontend is for a remote target
+        https://bugs.webkit.org/show_bug.cgi?id=193951
+        <rdar://problem/47621366>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/WebInspectorProxy.h:
+        (WebKit::WebInspectorProxy::InspectionTargetType): Added.
+        (WebKit::WebInspectorProxy::createFrontendWindow):
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::createFrontendWindow):
+        (WebKit::WebInspectorProxy::platformCreateFrontendWindow):
+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
+        (WebKit::RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow):
+
+        * UIProcess/API/Cocoa/_WKInspectorWindow.h: Moved from UIProcess/mac/WKInspectorWindow.h.
+        * UIProcess/API/Cocoa/_WKInspectorWindow.mm: Moved from UIProcess/mac/WKInspectorWindow.mm.
+        (-[WKInspectorWindow isRemote]): Added.
+
+        * Shared/API/Cocoa/_WKNSWindowExtras.mm:
+        (-[NSWindow _web_isWebInspectorWindow]):
+
+        * PlatformMac.cmake:
+        * SourcesCocoa.txt:
+        * UnifiedSources-input.xcfilelist:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-01-29  Alex Christensen  <[email protected]>
 
         Rename ChildProcess to AuxiliaryProcess

Modified: trunk/Source/WebKit/PlatformMac.cmake (240684 => 240685)


--- trunk/Source/WebKit/PlatformMac.cmake	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/PlatformMac.cmake	2019-01-29 22:40:44 UTC (rev 240685)
@@ -296,7 +296,6 @@
     UIProcess/mac/WKImmediateActionController.mm
     UIProcess/mac/WKInspectorViewController.mm
     UIProcess/mac/WKInspectorWKWebView.mm
-    UIProcess/mac/WKInspectorWindow.mm
     UIProcess/mac/WKPrintingView.mm
     UIProcess/mac/WKSharingServicePickerDelegate.mm
     UIProcess/mac/WKTextFinderClient.mm

Modified: trunk/Source/WebKit/Shared/API/Cocoa/_WKNSWindowExtras.mm (240684 => 240685)


--- trunk/Source/WebKit/Shared/API/Cocoa/_WKNSWindowExtras.mm	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/Shared/API/Cocoa/_WKNSWindowExtras.mm	2019-01-29 22:40:44 UTC (rev 240685)
@@ -30,13 +30,13 @@
 
 #if !TARGET_OS_IPHONE
 
-#import "WKInspectorWindow.h"
+#import "_WKInspectorWindow.h"
 
 @implementation NSWindow (WKExtras)
 
 - (BOOL)_web_isWebInspectorWindow
 {
-    return [self isKindOfClass:[WKInspectorWindow class]];
+    return [self isKindOfClass:[_WKInspectorWindow class]];
 }
 
 @end

Modified: trunk/Source/WebKit/SourcesCocoa.txt (240684 => 240685)


--- trunk/Source/WebKit/SourcesCocoa.txt	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/SourcesCocoa.txt	2019-01-29 22:40:44 UTC (rev 240685)
@@ -237,6 +237,7 @@
 UIProcess/API/Cocoa/_WKExperimentalFeature.mm
 UIProcess/API/Cocoa/_WKGeolocationPosition.mm
 UIProcess/API/Cocoa/_WKInspector.mm
+UIProcess/API/Cocoa/_WKInspectorWindow.mm
 UIProcess/API/Cocoa/_WKInternalDebugFeature.mm
 UIProcess/API/Cocoa/_WKLinkIconParameters.mm
 UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
@@ -438,7 +439,6 @@
 UIProcess/mac/WKFullScreenWindowController.mm
 UIProcess/mac/WKImmediateActionController.mm
 UIProcess/mac/WKInspectorViewController.mm
-UIProcess/mac/WKInspectorWindow.mm
 UIProcess/mac/WKInspectorWKWebView.mm
 UIProcess/mac/WKPrintingView.mm
 UIProcess/mac/WKSharingServicePickerDelegate.mm

Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.h (from rev 240684, trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.h) (0 => 240685)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.h	                        (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.h	2019-01-29 22:40:44 UTC (rev 240685)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
+
+WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA))
+@interface _WKInspectorWindow : NSWindow
+
+@property (nonatomic, getter=isForRemoteTarget) BOOL forRemoteTarget;
+
+@end
+
+#endif

Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.mm (from rev 240684, trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.mm) (0 => 240685)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.mm	                        (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.mm	2019-01-29 22:40:44 UTC (rev 240685)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKInspectorWindow.h"
+
+#if PLATFORM(MAC) && WK_API_ENABLED
+
+@implementation _WKInspectorWindow
+
+- (BOOL)isForRemoteTarget
+{
+    return _forRemoteTarget;
+}
+
+@end
+
+#endif

Modified: trunk/Source/WebKit/UIProcess/WebInspectorProxy.h (240684 => 240685)


--- trunk/Source/WebKit/UIProcess/WebInspectorProxy.h	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/UIProcess/WebInspectorProxy.h	2019-01-29 22:40:44 UTC (rev 240685)
@@ -105,7 +105,8 @@
     void updateForNewPageProcess(WebPageProxy*);
 
 #if PLATFORM(MAC) && WK_API_ENABLED
-    static RetainPtr<NSWindow> createFrontendWindow(NSRect savedWindowFrame);
+    enum class InspectionTargetType { Local, Remote };
+    static RetainPtr<NSWindow> createFrontendWindow(NSRect savedWindowFrame, InspectionTargetType);
 
     void updateInspectorWindowTitle() const;
     void inspectedViewFrameDidChange(CGFloat = 0);

Modified: trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm (240684 => 240685)


--- trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm	2019-01-29 22:40:44 UTC (rev 240685)
@@ -88,7 +88,7 @@
     m_inspectorView = adoptNS([[WKInspectorViewController alloc] initWithInspectedPage:nullptr]);
     [m_inspectorView.get() setDelegate:m_objCAdapter.get()];
 
-    m_window = WebInspectorProxy::createFrontendWindow(NSZeroRect);
+    m_window = WebInspectorProxy::createFrontendWindow(NSZeroRect, WebInspectorProxy::InspectionTargetType::Remote);
     [m_window setFrameAutosaveName:@"WKRemoteWebInspectorWindowFrame"];
 
     NSView *contentView = m_window.get().contentView;

Deleted: trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.h (240684 => 240685)


--- trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.h	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.h	2019-01-29 22:40:44 UTC (rev 240685)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <WebKit/WKFoundation.h>
-
-#if PLATFORM(MAC) && WK_API_ENABLED
-
-@interface WKInspectorWindow : NSWindow
-@end
-
-#endif

Deleted: trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.mm (240684 => 240685)


--- trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.mm	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/UIProcess/mac/WKInspectorWindow.mm	2019-01-29 22:40:44 UTC (rev 240685)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WKInspectorWindow.h"
-
-#if PLATFORM(MAC) && WK_API_ENABLED
-
-@implementation WKInspectorWindow
-@end
-
-#endif

Modified: trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm (240684 => 240685)


--- trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm	2019-01-29 22:40:44 UTC (rev 240685)
@@ -30,7 +30,6 @@
 
 #import "WKInspectorPrivateMac.h"
 #import "WKInspectorViewController.h"
-#import "WKInspectorWindow.h"
 #import "WKViewInternal.h"
 #import "WKWebViewInternal.h"
 #import "WebInspectorUIMessages.h"
@@ -37,6 +36,7 @@
 #import "WebPageGroup.h"
 #import "WebPageProxy.h"
 #import "_WKInspectorInternal.h"
+#import "_WKInspectorWindow.h"
 #import <SecurityInterface/SFCertificatePanel.h>
 #import <SecurityInterface/SFCertificateView.h>
 #import <WebCore/CertificateInfo.h>
@@ -228,14 +228,17 @@
     }
 }
 
-RetainPtr<NSWindow> WebInspectorProxy::createFrontendWindow(NSRect savedWindowFrame)
+RetainPtr<NSWindow> WebInspectorProxy::createFrontendWindow(NSRect savedWindowFrame, InspectionTargetType targetType)
 {
     NSRect windowFrame = !NSIsEmptyRect(savedWindowFrame) ? savedWindowFrame : NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight);
-    auto window = adoptNS([[WKInspectorWindow alloc] initWithContentRect:windowFrame styleMask:windowStyleMask backing:NSBackingStoreBuffered defer:NO]);
+    auto window = adoptNS([[_WKInspectorWindow alloc] initWithContentRect:windowFrame styleMask:windowStyleMask backing:NSBackingStoreBuffered defer:NO]);
     [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
     [window setReleasedWhenClosed:NO];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
 
+    bool forRemoteTarget = targetType == InspectionTargetType::Remote;
+    [window setForRemoteTarget:forRemoteTarget];
+
     CGFloat approximatelyHalfScreenSize = ([window screen].frame.size.width / 2) - 4;
     CGFloat minimumFullScreenWidth = std::max<CGFloat>(636, approximatelyHalfScreenSize);
     [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
@@ -282,7 +285,7 @@
     NSString *savedWindowFrameString = inspectedPage()->pageGroup().preferences().inspectorWindowFrame();
     NSRect savedWindowFrame = NSRectFromString(savedWindowFrameString);
 
-    m_inspectorWindow = WebInspectorProxy::createFrontendWindow(savedWindowFrame);
+    m_inspectorWindow = WebInspectorProxy::createFrontendWindow(savedWindowFrame, InspectionTargetType::Local);
     [m_inspectorWindow setDelegate:m_objCAdapter.get()];
 
     WKWebView *inspectorView = [m_inspectorViewController webView];

Modified: trunk/Source/WebKit/UnifiedSources-input.xcfilelist (240684 => 240685)


--- trunk/Source/WebKit/UnifiedSources-input.xcfilelist	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/UnifiedSources-input.xcfilelist	2019-01-29 22:40:44 UTC (rev 240685)
@@ -446,6 +446,7 @@
 $(SRCROOT)/UIProcess/API/Cocoa/_WKExperimentalFeature.mm
 $(SRCROOT)/UIProcess/API/Cocoa/_WKGeolocationPosition.mm
 $(SRCROOT)/UIProcess/API/Cocoa/_WKInspector.mm
+$(SRCROOT)/UIProcess/API/Cocoa/_WKInspectorWindow.mm
 $(SRCROOT)/UIProcess/API/Cocoa/_WKInternalDebugFeature.mm
 $(SRCROOT)/UIProcess/API/Cocoa/_WKLinkIconParameters.mm
 $(SRCROOT)/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
@@ -718,7 +719,6 @@
 $(SRCROOT)/UIProcess/mac/WKImmediateActionController.mm
 $(SRCROOT)/UIProcess/mac/WKInspectorViewController.mm
 $(SRCROOT)/UIProcess/mac/WKInspectorWKWebView.mm
-$(SRCROOT)/UIProcess/mac/WKInspectorWindow.mm
 $(SRCROOT)/UIProcess/mac/WKPrintingView.mm
 $(SRCROOT)/UIProcess/mac/WKSharingServicePickerDelegate.mm
 $(SRCROOT)/UIProcess/mac/WKTextFinderClient.mm

Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (240684 => 240685)


--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-01-29 22:25:36 UTC (rev 240684)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-01-29 22:40:44 UTC (rev 240685)
@@ -1307,7 +1307,7 @@
 		A55BA8351BA3E70A007CD33D /* WebInspectorFrontendAPIDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */; };
 		A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
 		A5C0F0A72000654D00536536 /* _WKNSWindowExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* WKInspectorWindow.h */; };
+		A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E391FC2183C1E900C8FB31 /* InspectorTargetProxy.h */; };
 		A5EC6AD42151BD7B00677D17 /* WebPageDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EC6AD32151BD6900677D17 /* WebPageDebuggable.h */; };
 		A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3894,8 +3894,8 @@
 		A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFileUploadPanel.mm; path = ios/forms/WKFileUploadPanel.mm; sourceTree = "<group>"; };
 		A5C0F0A52000654400536536 /* _WKNSWindowExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKNSWindowExtras.mm; sourceTree = "<group>"; };
 		A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKNSWindowExtras.h; sourceTree = "<group>"; };
-		A5C0F0A92000656E00536536 /* WKInspectorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKInspectorWindow.mm; sourceTree = "<group>"; };
-		A5C0F0AA2000656E00536536 /* WKInspectorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKInspectorWindow.h; sourceTree = "<group>"; };
+		A5C0F0A92000656E00536536 /* _WKInspectorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKInspectorWindow.mm; sourceTree = "<group>"; };
+		A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInspectorWindow.h; sourceTree = "<group>"; };
 		A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteWebInspectorProxyMac.mm; sourceTree = "<group>"; };
 		A5E391FB2183C1E900C8FB31 /* InspectorTargetProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTargetProxy.cpp; sourceTree = "<group>"; };
 		A5E391FC2183C1E900C8FB31 /* InspectorTargetProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTargetProxy.h; sourceTree = "<group>"; };
@@ -6049,6 +6049,8 @@
 				5CAFDE422130843500B1F7E1 /* _WKInspector.h */,
 				5CAFDE432130843600B1F7E1 /* _WKInspector.mm */,
 				5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */,
+				A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */,
+				A5C0F0A92000656E00536536 /* _WKInspectorWindow.mm */,
 				31B362942141EBAD007BFA53 /* _WKInternalDebugFeature.h */,
 				31B362922141EBAC007BFA53 /* _WKInternalDebugFeature.mm */,
 				31B362932141EBAD007BFA53 /* _WKInternalDebugFeatureInternal.h */,
@@ -8222,8 +8224,6 @@
 				9321D5871A38EE74008052BE /* WKImmediateActionController.mm */,
 				994BADF11F7D77EA00B571E7 /* WKInspectorViewController.h */,
 				994BADF21F7D77EB00B571E7 /* WKInspectorViewController.mm */,
-				A5C0F0AA2000656E00536536 /* WKInspectorWindow.h */,
-				A5C0F0A92000656E00536536 /* WKInspectorWindow.mm */,
 				A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */,
 				A518B5D11FE1D55B00F9FA28 /* WKInspectorWKWebView.mm */,
 				0FCB4E5C18BBE3D9000FCFC9 /* WKPrintingView.h */,
@@ -8863,6 +8863,7 @@
 				37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */,
 				5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */,
 				5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */,
+				A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */,
 				31B362952141EBCD007BFA53 /* _WKInternalDebugFeature.h in Headers */,
 				31B362972141EBD9007BFA53 /* _WKInternalDebugFeatureInternal.h in Headers */,
 				2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to