Title: [224268] trunk/Tools
- Revision
- 224268
- Author
- [email protected]
- Date
- 2017-10-31 18:27:39 -0700 (Tue, 31 Oct 2017)
Log Message
Web Inspector: Add Inspector menu items to Mac MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=65218
Reviewed by Joseph Pecoraro.
Add Option-Command-I shortcut and corresponding Show/Close Web Inspector menu item to Mac MiniBrowser.
Only works when browser window is focused, but at least WI can be opened without having to Inspect Element.
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController showHideWebInspector:]):
* MiniBrowser/mac/MainMenu.xib:
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController validateMenuItem:]):
(-[WK1BrowserWindowController showHideWebInspector:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController validateMenuItem:]):
(-[WK2BrowserWindowController showHideWebInspector:]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (224267 => 224268)
--- trunk/Tools/ChangeLog 2017-11-01 01:13:04 UTC (rev 224267)
+++ trunk/Tools/ChangeLog 2017-11-01 01:27:39 UTC (rev 224268)
@@ -1,3 +1,24 @@
+2017-10-31 Ross Kirsling <[email protected]>
+
+ Web Inspector: Add Inspector menu items to Mac MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=65218
+
+ Reviewed by Joseph Pecoraro.
+
+ Add Option-Command-I shortcut and corresponding Show/Close Web Inspector menu item to Mac MiniBrowser.
+ Only works when browser window is focused, but at least WI can be opened without having to Inspect Element.
+
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController showHideWebInspector:]):
+ * MiniBrowser/mac/MainMenu.xib:
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ (-[WK1BrowserWindowController showHideWebInspector:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (-[WK2BrowserWindowController showHideWebInspector:]):
+
2017-10-31 Alex Christensen <[email protected]>
Use asynchronous ResourceHandleClient calls for WebKit1
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (224267 => 224268)
--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2017-11-01 01:13:04 UTC (rev 224267)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2017-11-01 01:27:39 UTC (rev 224268)
@@ -72,6 +72,8 @@
- (IBAction)dumpSourceToConsole:(id)sender;
+- (IBAction)showHideWebInspector:(id)sender;
+
- (void)didChangeSettings;
- (NSURL *)currentURL;
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (224267 => 224268)
--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2017-11-01 01:13:04 UTC (rev 224267)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2017-11-01 01:27:39 UTC (rev 224268)
@@ -194,6 +194,11 @@
[self doesNotRecognizeSelector:_cmd];
}
+- (IBAction)showHideWebInspector:(id)sender
+{
+ [self doesNotRecognizeSelector:_cmd];
+}
+
- (void)didChangeSettings
{
[self doesNotRecognizeSelector:_cmd];
Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (224267 => 224268)
--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2017-11-01 01:13:04 UTC (rev 224267)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2017-11-01 01:27:39 UTC (rev 224268)
@@ -846,6 +846,12 @@
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="uef-kb-r9n"/>
+ <menuItem title="Show Web Inspector" keyEquivalent="i" id="xso-9z-R4u">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="showHideWebInspector:" target="-1" id="Cmx-g7-EPb"/>
+ </connections>
+ </menuItem>
<menuItem title="Show Extensions Manager" keyEquivalent="m" id="2f0-pH-KRx">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (224267 => 224268)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-11-01 01:13:04 UTC (rev 224267)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-11-01 01:27:39 UTC (rev 224268)
@@ -27,6 +27,7 @@
#import "AppDelegate.h"
#import "SettingsController.h"
+#import <WebKit/WebInspector.h>
#import <WebKit/WebKit.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPreferences.h>
@@ -148,6 +149,8 @@
[menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
else if (action == @selector(toggleEditable:))
[menuItem setState:self.isEditable ? NSOnState : NSOffState];
+ else if (action == @selector(showHideWebInspector:))
+ [menuItem setTitle:_webView.inspector.isOpen ? @"Close Web Inspector" : @"Show Web Inspector"];
if (action == @selector(setPageScale:))
[menuItem setState:areEssentiallyEqual([_webView _viewScaleFactor], [self pageScaleForMenuItemTag:[menuItem tag]])];
@@ -252,6 +255,15 @@
{
}
+- (IBAction)showHideWebInspector:(id)sender
+{
+ WebInspector *inspector = _webView.inspector;
+ if (inspector.isOpen)
+ [inspector close:sender];
+ else
+ [inspector show:sender];
+}
+
- (NSURL *)currentURL
{
return _webView.mainFrame.dataSource.request.URL;
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (224267 => 224268)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-11-01 01:13:04 UTC (rev 224267)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-11-01 01:27:39 UTC (rev 224268)
@@ -30,8 +30,10 @@
#import "AppDelegate.h"
#import "SettingsController.h"
#import <WebKit/WKFrameInfo.h>
+#import <WebKit/WKInspector.h>
#import <WebKit/WKNavigationActionPrivate.h>
#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKPage.h>
#import <WebKit/WKPreferencesPrivate.h>
#import <WebKit/WKUIDelegate.h>
#import <WebKit/WKUIDelegatePrivate.h>
@@ -205,6 +207,8 @@
[menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
else if (action == @selector(toggleEditable:))
[menuItem setState:self.isEditable ? NSOnState : NSOffState];
+ else if (action == @selector(showHideWebInspector:))
+ [menuItem setTitle:WKInspectorIsVisible(WKPageGetInspector(_webView._pageRefForTransitionToWKWebView)) ? @"Close Web Inspector" : @"Show Web Inspector"];
if (action == @selector(setPageScale:))
[menuItem setState:areEssentiallyEqual([_webView _pageScale], [self pageScaleForMenuItemTag:[menuItem tag]])];
@@ -278,6 +282,15 @@
{
}
+- (IBAction)showHideWebInspector:(id)sender
+{
+ WKInspectorRef inspectorRef = WKPageGetInspector(_webView._pageRefForTransitionToWKWebView);
+ if (WKInspectorIsVisible(inspectorRef))
+ WKInspectorHide(inspectorRef);
+ else
+ WKInspectorShow(inspectorRef);
+}
+
- (NSURL *)currentURL
{
return _webView.URL;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
