Changeset 85250 in webkit

Timestamp:

Apr 28, 2011 3:33:54 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

Web Inspector: REGRESSION(85051): Develop Menu items are wrong when inspector is frontmost window
​https://bugs.webkit.org/show_bug.cgi?id=59747

Reviewed by Timothy Hatcher.

Restore functions that were removed in r85051. They were needed when the inspector is the frontmost window.
Also update them to call _inspectedWebView.get() - since it's a RetainPtr now.

• WebCoreSupport/WebInspectorClient.mm:

(-[WebInspectorWindowController showWebInspector:]):
(-[WebInspectorWindowController showErrorConsole:]):
(-[WebInspectorWindowController toggleDebuggingJavaScript:]):
(-[WebInspectorWindowController toggleProfilingJavaScript:]):
(-[WebInspectorWindowController validateUserInterfaceItem:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebInspectorClient.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-28  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: REGRESSION(85051): Develop Menu items are wrong when inspector is frontmost window
+        https://bugs.webkit.org/show_bug.cgi?id=59747
+
+        Restore functions that were removed in r85051. They were needed when the inspector is the frontmost window.
+        Also update them to call _inspectedWebView.get() - since it's a RetainPtr now.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController showWebInspector:]):
+        (-[WebInspectorWindowController showErrorConsole:]):
+        (-[WebInspectorWindowController toggleDebuggingJavaScript:]):
+        (-[WebInspectorWindowController toggleProfilingJavaScript:]):
+        (-[WebInspectorWindowController validateUserInterfaceItem:]):
+
 2011-04-28  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

@@ -473 +473 @@
 }
 
+// MARK: -
+// These methods can be used by UI elements such as menu items and toolbar buttons when the inspector is the key window.
+
+// This method is really only implemented to keep any UI elements enabled.
+- (void)showWebInspector:(id)sender
+{
+    [[_inspectedWebView.get() inspector] show:sender];
+}
+
+- (void)showErrorConsole:(id)sender
+{
+    [[_inspectedWebView.get() inspector] showConsole:sender];
+}
+
+- (void)toggleDebuggingJavaScript:(id)sender
+{
+    [[_inspectedWebView.get() inspector] toggleDebuggingJavaScript:sender];
+}
+
+- (void)toggleProfilingJavaScript:(id)sender
+{
+    [[_inspectedWebView.get() inspector] toggleProfilingJavaScript:sender];
+}
+
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
+{
+    BOOL isMenuItem = [(id)item isKindOfClass:[NSMenuItem class]];
+    if ([item action] == @selector(toggleDebuggingJavaScript:) && isMenuItem) {
+        NSMenuItem *menuItem = (NSMenuItem *)item;
+        if ([[_inspectedWebView.get() inspector] isDebuggingJavaScript])
+            [menuItem setTitle:UI_STRING_INTERNAL("Stop Debugging JavaScript", "title for Stop Debugging JavaScript menu item")];
+        else
+            [menuItem setTitle:UI_STRING_INTERNAL("Start Debugging JavaScript", "title for Start Debugging JavaScript menu item")];
+    } else if ([item action] == @selector(toggleProfilingJavaScript:) && isMenuItem) {
+        NSMenuItem *menuItem = (NSMenuItem *)item;
+        if ([[_inspectedWebView.get() inspector] isProfilingJavaScript])
+            [menuItem setTitle:UI_STRING_INTERNAL("Stop Profiling JavaScript", "title for Stop Profiling JavaScript menu item")];
+        else
+            [menuItem setTitle:UI_STRING_INTERNAL("Start Profiling JavaScript", "title for Start Profiling JavaScript menu item")];
+    }
+
+    return YES;
+}
+
+
 @end