Diff
Modified: trunk/Source/WebKit/ChangeLog (225906 => 225907)
--- trunk/Source/WebKit/ChangeLog 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/ChangeLog 2017-12-14 17:08:52 UTC (rev 225907)
@@ -1,3 +1,37 @@
+2017-12-14 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Cmd-Option-R in docked inspector causes the inspector to reload instead of the inspected page
+ https://bugs.webkit.org/show_bug.cgi?id=180775
+ <rdar://problem/35964592>
+
+ Reviewed by Brian Burg.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ Remove old files add new files.
+
+ * PlatformMac.cmake:
+ * UIProcess/mac/WKWebInspectorWKWebView.h: Removed.
+ * UIProcess/mac/WKWebInspectorWKWebView.mm: Removed.
+ Remove unused WKWebInspectorWKWebView.
+
+ * UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm:
+ * UIProcess/mac/WKInspectorViewController.mm:
+ (-[WKInspectorViewController dealloc]):
+ (-[WKInspectorViewController webView]):
+ (-[WKInspectorViewController inspectorWKWebViewReload:]):
+ (-[WKInspectorViewController inspectorWKWebViewReloadFromOrigin:]):
+ Handle WKWebView IBActions sent to the inspector frontend WKWebView.
+
+ * UIProcess/mac/WKInspectorWKWebView.h:
+ * UIProcess/mac/WKInspectorWKWebView.mm:
+ (-[WKInspectorWKWebView tag]):
+ (-[WKInspectorWKWebView inspectorWKWebViewDelegate]):
+ (-[WKInspectorWKWebView setInspectorWKWebViewDelegate:]):
+ (-[WKInspectorWKWebView reload:]):
+ (-[WKInspectorWKWebView reloadFromOrigin:]):
+ Move WKInspectorWKWebView into its own file. Include a delegate
+ to handle reload IBActions that will want to override.
+
2017-12-13 Chris Dumez <cdu...@apple.com>
Fix copy/paste error in ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration()
Modified: trunk/Source/WebKit/PlatformMac.cmake (225906 => 225907)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-12-14 17:08:52 UTC (rev 225907)
@@ -313,7 +313,6 @@
UIProcess/mac/WKTextFinderClient.mm
UIProcess/mac/WKTextInputWindowController.mm
UIProcess/mac/WKViewLayoutStrategy.mm
- UIProcess/mac/WKWebInspectorWKWebView.mm
UIProcess/mac/WebColorPickerMac.mm
UIProcess/mac/WebContextMenuProxyMac.mm
UIProcess/mac/WebCookieManagerProxyMac.mm
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm (225906 => 225907)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm 2017-12-14 17:08:52 UTC (rev 225907)
@@ -29,7 +29,6 @@
#if PLATFORM(MAC) && WK_API_ENABLED
#import "RemoteWebInspectorProxy.h"
-#import "WKWebInspectorWKWebView.h"
using namespace WebKit;
Modified: trunk/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm (225906 => 225907)
--- trunk/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm 2017-12-14 17:08:52 UTC (rev 225907)
@@ -28,7 +28,9 @@
#if PLATFORM(MAC) && WK_API_ENABLED
+#import "VersionChecks.h"
#import "WKFrameInfo.h"
+#import "WKInspectorWKWebView.h"
#import "WKNavigationAction.h"
#import "WKNavigationDelegate.h"
#import "WKOpenPanelParameters.h"
@@ -42,25 +44,11 @@
#import "WebInspectorUtilities.h"
#import "WebPageProxy.h"
-// FIXME: this should be declared in the ObjC API; currently it's in the C SPI.
-const NSInteger WKInspectorViewTag = 1000;
-
using namespace WebKit;
-// Clients need to be able to tell whether a subview is a docked inspector view, so override the tag.
-@interface WKInspectorWKWebView : WKWebView
+@interface WKInspectorViewController () <WKUIDelegate, WKNavigationDelegate, WKInspectorWKWebViewDelegate>
@end
-@implementation WKInspectorWKWebView
-- (NSInteger)tag
-{
- return WKInspectorViewTag;
-}
-@end
-
-@interface WKInspectorViewController () <WKUIDelegate, WKNavigationDelegate>
-@end
-
@implementation WKInspectorViewController {
WebPageProxy* _inspectedPage;
RetainPtr<WKInspectorWKWebView> _webView;
@@ -83,6 +71,7 @@
if (_webView) {
[_webView setUIDelegate:nil];
[_webView setNavigationDelegate:nil];
+ [_webView setInspectorWKWebViewDelegate:nil];
_webView = nil;
}
@@ -102,6 +91,7 @@
_webView = adoptNS([[WKInspectorWKWebView alloc] initWithFrame:initialFrame configuration:[self configuration]]);
[_webView setUIDelegate:self];
[_webView setNavigationDelegate:self];
+ [_webView setInspectorWKWebViewDelegate:self];
[_webView _setAutomaticallyAdjustsContentInsets:NO];
[_webView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
}
@@ -236,6 +226,28 @@
decisionHandler(WKNavigationActionPolicyCancel);
}
+// MARK: WKInspectorWKWebViewDelegate methods
+
+- (void)inspectorWKWebViewReload:(WKInspectorWKWebView *)webView
+{
+ if (!_inspectedPage)
+ return;
+
+ OptionSet<WebCore::ReloadOption> reloadOptions;
+ if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
+ reloadOptions |= WebCore::ReloadOption::ExpiredOnly;
+
+ _inspectedPage->reload(reloadOptions);
+}
+
+- (void)inspectorWKWebViewReloadFromOrigin:(WKInspectorWKWebView *)webView
+{
+ if (!_inspectedPage)
+ return;
+
+ _inspectedPage->reload(WebCore::ReloadOption::FromOrigin);
+}
+
@end
#endif // PLATFORM(MAC) && WK_API_ENABLED
Copied: trunk/Source/WebKit/UIProcess/mac/WKInspectorWKWebView.h (from rev 225906, trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.h) (0 => 225907)
--- trunk/Source/WebKit/UIProcess/mac/WKInspectorWKWebView.h (rev 0)
+++ trunk/Source/WebKit/UIProcess/mac/WKInspectorWKWebView.h 2017-12-14 17:08:52 UTC (rev 225907)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#pragma once
+
+#import <WebKit/WKWebView.h>
+
+#if PLATFORM(MAC) && WK_API_ENABLED
+
+@protocol WKInspectorWKWebViewDelegate;
+
+@interface WKInspectorWKWebView : WKWebView
+@property (nonatomic, weak) id <WKInspectorWKWebViewDelegate> inspectorWKWebViewDelegate;
+@end
+
+@protocol WKInspectorWKWebViewDelegate
+@required
+- (void)inspectorWKWebViewReload:(WKInspectorWKWebView *)webView;
+- (void)inspectorWKWebViewReloadFromOrigin:(WKInspectorWKWebView *)webView;
+@end
+
+#endif // PLATFORM(MAC) && WK_API_ENABLED
Copied: trunk/Source/WebKit/UIProcess/mac/WKInspectorWKWebView.mm (from rev 225906, trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.h) (0 => 225907)
--- trunk/Source/WebKit/UIProcess/mac/WKInspectorWKWebView.mm (rev 0)
+++ trunk/Source/WebKit/UIProcess/mac/WKInspectorWKWebView.mm 2017-12-14 17:08:52 UTC (rev 225907)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2017 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 "WKInspectorWKWebView.h"
+
+#if PLATFORM(MAC) && WK_API_ENABLED
+
+#import "WKInspectorPrivateMac.h"
+#import "WeakObjCPtr.h"
+
+@implementation WKInspectorWKWebView {
+ WebKit::WeakObjCPtr<id <WKInspectorWKWebViewDelegate>> _inspectorWKWebViewDelegate;
+}
+
+- (NSInteger)tag
+{
+ return WKInspectorViewTag;
+}
+
+- (id <WKInspectorWKWebViewDelegate>)inspectorWKWebViewDelegate
+{
+ return _inspectorWKWebViewDelegate.getAutoreleased();
+}
+
+- (void)setInspectorWKWebViewDelegate:(id <WKInspectorWKWebViewDelegate>)delegate
+{
+ _inspectorWKWebViewDelegate = delegate;
+}
+
+- (IBAction)reload:(id)sender
+{
+ [self.inspectorWKWebViewDelegate inspectorWKWebViewReload:self];
+}
+
+- (IBAction)reloadFromOrigin:(id)sender
+{
+ [self.inspectorWKWebViewDelegate inspectorWKWebViewReloadFromOrigin:self];
+}
+
+@end
+
+#endif
Deleted: trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.h (225906 => 225907)
--- trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.h 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.h 2017-12-14 17:08:52 UTC (rev 225907)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2010, 2014 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.
- */
-
-#pragma once
-
-#import <WebKit/WKWebView.h>
-
-#if PLATFORM(MAC) && WK_API_ENABLED
-
-@interface WKWebInspectorWKWebView : WKWebView
-
-- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration;
-
-@end
-
-#endif
Deleted: trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.mm (225906 => 225907)
--- trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.mm 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/UIProcess/mac/WKWebInspectorWKWebView.mm 2017-12-14 17:08:52 UTC (rev 225907)
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010, 2014 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 "WKWebInspectorWKWebView.h"
-
-#if PLATFORM(MAC) && WK_API_ENABLED
-
-#import "WKAPICast.h"
-#import "WKInspectorPrivateMac.h"
-#import "WKMutableArray.h"
-#import "WKOpenPanelParametersRef.h"
-#import "WKOpenPanelResultListener.h"
-#import "WKRetainPtr.h"
-#import "WKURLCF.h"
-#import "WKWebViewInternal.h"
-#import "WebPageProxy.h"
-
-using namespace WebKit;
-
-namespace WebKit {
-
-static WKRect getWindowFrame(WKPageRef, const void* clientInfo)
-{
- WKWebInspectorWKWebView *inspectorWKWebView = static_cast<WKWebInspectorWKWebView *>(const_cast<void*>(clientInfo));
- ASSERT(inspectorWKWebView);
-
- if (!inspectorWKWebView.window)
- return WKRectMake(0, 0, 0, 0);
-
- NSRect frame = inspectorWKWebView.frame;
- return WKRectMake(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
-}
-
-static void setWindowFrame(WKPageRef, WKRect frame, const void* clientInfo)
-{
- WKWebInspectorWKWebView *inspectorWKWebView = static_cast<WKWebInspectorWKWebView *>(const_cast<void*>(clientInfo));
- ASSERT(inspectorWKWebView);
-
- if (!inspectorWKWebView.window)
- return;
-
- [inspectorWKWebView.window setFrame:NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height) display:YES];
-}
-
-static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long, unsigned long long, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void*)
-{
- return std::max<unsigned long long>(expectedUsage, currentDatabaseUsage * 1.25);
-}
-
-static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
-{
- WKWebInspectorWKWebView *inspectorWKWebView = static_cast<WKWebInspectorWKWebView *>(const_cast<void*>(clientInfo));
- ASSERT(inspectorWKWebView);
-
- NSOpenPanel *openPanel = [NSOpenPanel openPanel];
- [openPanel setAllowsMultipleSelection:WKOpenPanelParametersGetAllowsMultipleFiles(parameters)];
-
- WKRetain(listener);
-
- auto completionHandler = ^(NSInteger result) {
- if (result == NSModalResponseOK) {
- WKRetainPtr<WKMutableArrayRef> fileURLs = adoptWK(WKMutableArrayCreate());
-
- for (NSURL* nsURL in [openPanel URLs]) {
- WKRetainPtr<WKURLRef> wkURL = adoptWK(WKURLCreateWithCFURL(reinterpret_cast<CFURLRef>(nsURL)));
- WKArrayAppendItem(fileURLs.get(), wkURL.get());
- }
-
- WKOpenPanelResultListenerChooseFiles(listener, fileURLs.get());
- } else
- WKOpenPanelResultListenerCancel(listener);
-
- WKRelease(listener);
- };
-
- if (inspectorWKWebView.window)
- [openPanel beginSheetModalForWindow:inspectorWKWebView.window completionHandler:completionHandler];
- else
- completionHandler([openPanel runModal]);
-}
-
-} // namespace WebKit
-
-@implementation WKWebInspectorWKWebView
-
-- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
-{
- if (!(self = [super initWithFrame:frame configuration:configuration]))
- return nil;
-
- [self _setAutomaticallyAdjustsContentInsets:NO];
-
- WKPageUIClientV2 uiClient = {
- { 2, self },
- nullptr, // createNewPage_deprecatedForUseWithV0
- nullptr, // showPage
- nullptr, // closePage
- nullptr, // takeFocus
- nullptr, // focus
- nullptr, // unfocus
- nullptr, // runJavaScriptAlert
- nullptr, // runJavaScriptConfirm
- nullptr, // runJavaScriptPrompt
- nullptr, // setStatusText
- nullptr, // mouseDidMoveOverElement_deprecatedForUseWithV0
- nullptr, // missingPluginButtonClicked_deprecatedForUseWithV0
- nullptr, // didNotHandleKeyEvent
- nullptr, // didNotHandleWheelEvent
- nullptr, // areToolbarsVisible
- nullptr, // setToolbarsVisible
- nullptr, // isMenuBarVisible
- nullptr, // setMenuBarVisible
- nullptr, // isStatusBarVisible
- nullptr, // setStatusBarVisible
- nullptr, // isResizable
- nullptr, // setResizable
- getWindowFrame,
- setWindowFrame,
- nullptr, // runBeforeUnloadConfirmPanel
- nullptr, // didDraw
- nullptr, // pageDidScroll
- exceededDatabaseQuota,
- runOpenPanel,
- nullptr, // decidePolicyForGeolocationPermissionRequest
- nullptr, // headerHeight
- nullptr, // footerHeight
- nullptr, // drawHeader
- nullptr, // drawFooter
- nullptr, // printFrame
- nullptr, // runModal
- nullptr, // unused
- nullptr, // saveDataToFileInDownloadsFolder
- nullptr, // shouldInterruptJavaScript
- nullptr, // createPage
- nullptr, // mouseDidMoveOverElement
- nullptr, // decidePolicyForNotificationPermissionRequest
- nullptr, // unavailablePluginButtonClicked_deprecatedForUseWithV1
- nullptr, // showColorPicker
- nullptr, // hideColorPicker
- nullptr, // unavailablePluginButtonClicked
- };
-
- WebPageProxy* inspectorPage = self->_page.get();
- WKPageSetPageUIClient(toAPI(inspectorPage), &uiClient.base);
-
- return self;
-}
-
-- (NSInteger)tag
-{
- return WKInspectorViewTag;
-}
-
-@end
-
-#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (225906 => 225907)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-12-14 17:04:21 UTC (rev 225906)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-12-14 17:08:52 UTC (rev 225907)
@@ -1542,6 +1542,8 @@
A1FB68241F6E518200C43F9F /* WKCrashReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = A1FB68221F6E518200C43F9F /* WKCrashReporter.h */; settings = {ATTRIBUTES = (Private, ); }; };
A1FB68251F6E518200C43F9F /* WKCrashReporter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */; };
A1FB68271F6E51C100C43F9F /* CrashReporterClientSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A1FB68261F6E51C100C43F9F /* CrashReporterClientSPI.h */; };
+ A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */; };
+ A518B5D31FE1D55B00F9FA28 /* WKInspectorWKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A518B5D11FE1D55B00F9FA28 /* WKInspectorWKWebView.mm */; };
A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */; };
A54293A5195A43DD002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm in Sources */ = {isa = PBXBuildFile; fileRef = A54293A3195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm */; };
A55BA8101BA1317E007CD33D /* _WKRemoteWebInspectorViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA80C1BA12BE1007CD33D /* _WKRemoteWebInspectorViewController.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1558,8 +1560,6 @@
A55BA8361BA3E70D007CD33D /* WebInspectorFrontendAPIDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A55BA8321BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.cpp */; };
A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
A58B6F0918FCA733008CBA53 /* WKFileUploadPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */; };
- A5D3504B1D752116005124A9 /* WKWebInspectorWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = A5D350491D752116005124A9 /* WKWebInspectorWKWebView.h */; };
- A5D3504C1D752116005124A9 /* WKWebInspectorWKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5D3504A1D752116005124A9 /* WKWebInspectorWKWebView.mm */; };
A5D3504E1D78F5B3005124A9 /* RemoteWebInspectorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */; };
A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */; };
@@ -3963,6 +3963,8 @@
A1FB68221F6E518200C43F9F /* WKCrashReporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKCrashReporter.h; sourceTree = "<group>"; };
A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCrashReporter.mm; sourceTree = "<group>"; };
A1FB68261F6E51C100C43F9F /* CrashReporterClientSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CrashReporterClientSPI.h; sourceTree = "<group>"; };
+ A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKInspectorWKWebView.h; sourceTree = "<group>"; };
+ A518B5D11FE1D55B00F9FA28 /* WKInspectorWKWebView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKInspectorWKWebView.mm; sourceTree = "<group>"; };
A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKInspectorNodeSearchGestureRecognizer.h; path = ios/WKInspectorNodeSearchGestureRecognizer.h; sourceTree = "<group>"; };
A54293A3195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKInspectorNodeSearchGestureRecognizer.mm; path = ios/WKInspectorNodeSearchGestureRecognizer.mm; sourceTree = "<group>"; };
A55BA80C1BA12BE1007CD33D /* _WKRemoteWebInspectorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRemoteWebInspectorViewController.h; sourceTree = "<group>"; };
@@ -3981,8 +3983,6 @@
A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorFrontendAPIDispatcher.h; sourceTree = "<group>"; };
A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFileUploadPanel.h; path = ios/forms/WKFileUploadPanel.h; sourceTree = "<group>"; };
A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFileUploadPanel.mm; path = ios/forms/WKFileUploadPanel.mm; sourceTree = "<group>"; };
- A5D350491D752116005124A9 /* WKWebInspectorWKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebInspectorWKWebView.h; sourceTree = "<group>"; };
- A5D3504A1D752116005124A9 /* WKWebInspectorWKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebInspectorWKWebView.mm; sourceTree = "<group>"; };
A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteWebInspectorProxyMac.mm; sourceTree = "<group>"; };
A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
A72D5D7F1236CBA800A88B15 /* APISerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISerializedScriptValue.h; sourceTree = "<group>"; };
@@ -7921,6 +7921,8 @@
9321D5871A38EE74008052BE /* WKImmediateActionController.mm */,
994BADF11F7D77EA00B571E7 /* WKInspectorViewController.h */,
994BADF21F7D77EB00B571E7 /* WKInspectorViewController.mm */,
+ A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */,
+ A518B5D11FE1D55B00F9FA28 /* WKInspectorWKWebView.mm */,
0FCB4E5C18BBE3D9000FCFC9 /* WKPrintingView.h */,
0FCB4E5D18BBE3D9000FCFC9 /* WKPrintingView.mm */,
513E462B1AD837560016234A /* WKSharingServicePickerDelegate.h */,
@@ -7931,8 +7933,6 @@
0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */,
2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */,
2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */,
- A5D350491D752116005124A9 /* WKWebInspectorWKWebView.h */,
- A5D3504A1D752116005124A9 /* WKWebInspectorWKWebView.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -9343,6 +9343,7 @@
A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */,
6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */,
994BADF41F7D781400B571E7 /* WKInspectorViewController.h in Headers */,
+ A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */,
51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
@@ -9495,7 +9496,6 @@
BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */,
C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */,
C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */,
- A5D3504B1D752116005124A9 /* WKWebInspectorWKWebView.h in Headers */,
1AA2E56718D77508003814BD /* WKWebProcessBundleParameters.h in Headers */,
BC989D82161A7E5D000D46D3 /* WKWebProcessPlugIn.h in Headers */,
BC8F2F2B16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h in Headers */,
@@ -10964,6 +10964,7 @@
0F3C725C196F605200AEDD0C /* WKInspectorHighlightView.mm in Sources */,
A54293A5195A43DD002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm in Sources */,
994BADF31F7D781100B571E7 /* WKInspectorViewController.mm in Sources */,
+ A518B5D31FE1D55B00F9FA28 /* WKInspectorWKWebView.mm in Sources */,
51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */,
C98C48A91B6FD5B500145103 /* WKMediaSessionFocusManager.cpp in Sources */,
C9CD439E1B4B025300239E33 /* WKMediaSessionMetadata.cpp in Sources */,
@@ -11057,7 +11058,6 @@
2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */,
C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */,
- A5D3504C1D752116005124A9 /* WKWebInspectorWKWebView.mm in Sources */,
1AA2E56618D77508003814BD /* WKWebProcessBundleParameters.mm in Sources */,
BC989D81161A7E5D000D46D3 /* WKWebProcessPlugIn.mm in Sources */,
BC8F2F2A16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.mm in Sources */,
