Changeset 120311 in webkit

Timestamp:

Jun 14, 2012 3:34:26 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Implement ExtensionPanel.show() method
​https://bugs.webkit.org/show_bug.cgi?id=88473

Source/WebCore:

Implemented ExtensionPanel.show() API method to allow extension
developers to show their panel when needed.

Patch by Jan Keromnes <​janx@linux.com> on 2012-06-14
Reviewed by Pavel Feldman.

Tests for this method are in:
LayoutTests/inspector/extensions/extensions-panel.html

• inspector/front-end/ExtensionAPI.js:

(defineCommonExtensionSymbols):
(injectedExtensionAPI.ExtensionPanelImpl.prototype.createStatusBarButton):
(injectedExtensionAPI.ExtensionPanelImpl.prototype.show):

• inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer):
(WebInspector.ExtensionServer.prototype._onShowPanel):

LayoutTests:

Add output for ExtensionPanel callbacks, and use ExtensionPanel.show()
to show the panel. Fix expected.

Patch by Jan Keromnes <​janx@linux.com> on 2012-06-14
Reviewed by Pavel Feldman.

• inspector/extensions/extensions-panel-expected.txt:
• inspector/extensions/extensions-panel.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/extensions/extensions-panel-expected.txt (modified) (3 diffs)
• LayoutTests/inspector/extensions/extensions-panel.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ExtensionAPI.js (modified) (4 diffs)
• Source/WebCore/inspector/front-end/ExtensionServer.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-14  Jan Keromnes  <janx@linux.com>
+
+        Web Inspector: Implement ExtensionPanel.show() method
+        https://bugs.webkit.org/show_bug.cgi?id=88473
+
+        Add output for ExtensionPanel callbacks, and use ExtensionPanel.show()
+        to show the panel. Fix expected.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/extensions/extensions-panel-expected.txt:
+        * inspector/extensions/extensions-panel.html:
+
 2012-06-14  David Barr  <davidbarr@chromium.org>
 

trunk/LayoutTests/inspector/extensions/extensions-panel-expected.txt

@@ +1 @@
+CONSOLE MESSAGE: line 8: hello
 Tests WebInspector extension API
 
@@ -19 +20 @@
     }
     createStatusBarButton : <function>
+    show : <function>
 }
 Extension panel size correct
+Panel shown
 RUNNING TEST: extension_testStatusBarButtons
 Created a status bar button, dump follows:
@@ -30 +33 @@
     update : <function>
 }
+Panel hidden
 button1 clicked
 Status bar buttons state:

trunk/LayoutTests/inspector/extensions/extensions-panel.html

@@ -4 +4 @@
 <script src="../../http/tests/inspector/extensions-test.js"></script>
 <script type="text/javascript">
+function logMessage()
+{
+    console.log("hello");
+}
 
 function initialize_extensionsPanelTest()
@@ -53 +57 @@
         panel.statusBarItems[index].click();
     }
+
+    InspectorTest.clickOnURL = function()
+    {
+        WebInspector.showPanel("console");
+        var xpathResult = document.evaluate("//a[starts-with(., 'extensions-panel.html')]",
+                                            WebInspector.panels.console.element, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null);
+        var click = document.createEvent("MouseEvent");
+        click.initMouseEvent("click", true, true);
+        xpathResult.singleNodeValue.dispatchEvent(click);
+    }
 }
 
@@ -63 +77 @@
         output("Panel created");
         dumpObject(panel);
-        // This will force extension iframe to be really loaded and will cause waitForPanel() callback below.
-        extension_showPanel("extension");
+        panel.onHidden.addListener(function() {
+            output("Panel hidden");
+        });
+        panel.onShown.addListener(function(window) {
+            output("Panel shown");
+        });
+
+        // This is not authorized and therefore should not produce any output
+        panel.show();
+        extension_showPanel("console");
+
+        function handleOpenResource(resource, lineNumber)
+        {
+            // This will force extension iframe to be really loaded and will cause waitForPanel() callback below.
+            panel.show();
+        }
+        webInspector.panels.setOpenResourceHandler(handleOpenResource);
+        evaluateOnFrontend("WebInspector.openAnchorLocationRegistry._activeHandler = 'test extension'");
+        webInspector.inspectedWindow.eval("logMessage()", function() {
+            evaluateOnFrontend("InspectorTest.clickOnURL();");
+        });
     }
     // The panel code is expected to report its size via InspectorTest.panelCallback()

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-14  Jan Keromnes  <janx@linux.com>
+
+        Web Inspector: Implement ExtensionPanel.show() method
+        https://bugs.webkit.org/show_bug.cgi?id=88473
+
+        Implemented ExtensionPanel.show() API method to allow extension
+        developers to show their panel when needed.
+
+        Reviewed by Pavel Feldman.
+
+        Tests for this method are in:
+        LayoutTests/inspector/extensions/extensions-panel.html
+
+        * inspector/front-end/ExtensionAPI.js:
+        (defineCommonExtensionSymbols):
+        (injectedExtensionAPI.ExtensionPanelImpl.prototype.createStatusBarButton):
+        (injectedExtensionAPI.ExtensionPanelImpl.prototype.show):
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer):
+        (WebInspector.ExtensionServer.prototype._onShowPanel):
+
 2012-06-14  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js

@@ -85 +85 @@
         SetSidebarHeight: "setSidebarHeight",
         SetSidebarPage: "setSidebarPage",
+        ShowPanel: "showPanel",
         StopAuditCategoryRun: "stopAuditCategoryRun",
         Unsubscribe: "unsubscribe",
@@ -101 +102 @@
 var commands = apiPrivate.Commands;
 var events = apiPrivate.Events;
+var userAction = false;
 
 // Here and below, all constructors are private to API implementation.
@@ -306 +308 @@
             function callbackWrapper(message)
             {
-                callback.call(null, new Resource(message.resource), message.lineNumber);
+                // Allow the panel to show itself when handling the event.
+                userAction = true;
+                try {
+                    callback.call(null, new Resource(message.resource), message.lineNumber);
+                } finally {
+                    userAction = false;
+                }
             }
             extensionServer.registerHandler(events.OpenResource, callbackWrapper);
@@ -395 +403 @@
         extensionServer.sendRequest(request);
         return new Button(id);
+    },
+
+    show: function()
+    {
+        if (!userAction)
+            return;
+
+        var request = {
+            command: commands.ShowPanel,
+            id: this._id
+        };
+        extensionServer.sendRequest(request);
     }
 };

trunk/Source/WebCore/inspector/front-end/ExtensionServer.js

@@ -67 +67 @@
     this._registerHandler(commands.SetSidebarContent, this._onSetSidebarContent.bind(this));
     this._registerHandler(commands.SetSidebarPage, this._onSetSidebarPage.bind(this));
+    this._registerHandler(commands.ShowPanel, this._onShowPanel.bind(this));
     this._registerHandler(commands.StopAuditCategoryRun, this._onStopAuditCategoryRun.bind(this));
     this._registerHandler(commands.Subscribe, this._onSubscribe.bind(this));
@@ -203 +204 @@
         WebInspector.addPanel(panel);
         return this._status.OK();
+    },
+
+    _onShowPanel: function(message)
+    {
+        // Note: WebInspector.showPanel already sanitizes input.
+        WebInspector.showPanel(message.id);
     },