Title: [100145] trunk
Revision
100145
Author
[email protected]
Date
2011-11-14 08:29:34 -0800 (Mon, 14 Nov 2011)

Log Message

Web Inspector: expose iframe window to the onShown event handler of panels & sidebars
https://bugs.webkit.org/show_bug.cgi?id=72268

Reviewed by Pavel Feldman.

Source/WebCore:

- replace IFrameView with ExtensionView;
- inherit both ExtensionPanel and ExtensionSidebarPane from ExtensionView in the API;
- move Panel.{onShow|onHide} to ExtensionView, effectively disabling show/hide notifications for non-extension panels and enabling it for sidebar panes;
- expose iframe's window object in the onShow event handler.

* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* inspector/compile-front-end.sh:
* inspector/front-end/ExtensionAPI.js:
(injectedExtensionAPI.ExtensionViewImpl.dispatchShowEvent):
(injectedExtensionAPI):
(injectedExtensionAPI.PanelWithSidebarImpl):
(injectedExtensionAPI.ExtensionPanelImpl):
(injectedExtensionAPI.ExtensionSidebarPaneImpl):
* inspector/front-end/ExtensionPanel.js:
(WebInspector.ExtensionView):
(WebInspector.ExtensionView.prototype.wasShown):
(WebInspector.ExtensionView.prototype.willHide):
(WebInspector.ExtensionView.prototype._onLoad):
(WebInspector.ExtensionPanel):
(WebInspector.ExtensionSidebarPane.prototype.setPage):
* inspector/front-end/ExtensionServer.js:
(WebInspector.ExtensionServer.prototype.notifyViewShown):
(WebInspector.ExtensionServer.prototype.notifyViewHidden):
(WebInspector.ExtensionServer.prototype._onCreatePanel):
* inspector/front-end/IFrameView.js: Removed.
* inspector/front-end/Panel.js:
(WebInspector.Panel.prototype.wasShown):
(WebInspector.Panel.prototype.willHide):
* inspector/front-end/WebKit.qrc:
* inspector/front-end/inspector.html:

LayoutTests:

* inspector/extensions/extensions-api-expected.txt:
* inspector/extensions/extensions-events-expected.txt:
* inspector/extensions/extensions-events.html:
* inspector/extensions/extensions-expected.txt:
* platform/chromium/inspector/extensions/extensions-api-expected.txt:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (100144 => 100145)


--- trunk/LayoutTests/ChangeLog	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/LayoutTests/ChangeLog	2011-11-14 16:29:34 UTC (rev 100145)
@@ -1,3 +1,16 @@
+2011-11-14  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose iframe window to the onShown event handler of panels & sidebars
+        https://bugs.webkit.org/show_bug.cgi?id=72268
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/extensions/extensions-api-expected.txt:
+        * inspector/extensions/extensions-events-expected.txt:
+        * inspector/extensions/extensions-events.html:
+        * inspector/extensions/extensions-expected.txt:
+        * platform/chromium/inspector/extensions/extensions-api-expected.txt:
+
 2011-11-14  Csaba Osztrogonác  <[email protected]>
 
         [Qt] Unreviewed evening gardening. Try to make the bot green.

Modified: trunk/LayoutTests/inspector/extensions/extensions-api-expected.txt (100144 => 100145)


--- trunk/LayoutTests/inspector/extensions/extensions-api-expected.txt	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/LayoutTests/inspector/extensions/extensions-api-expected.txt	2011-11-14 16:29:34 UTC (rev 100145)
@@ -22,14 +22,6 @@
     }
     panels : {
         elements : {
-            onShown : {
-                addListener : <function>
-                removeListener : <function>
-            }
-            onHidden : {
-                addListener : <function>
-                removeListener : <function>
-            }
             createSidebarPane : <function>
             onSelectionChanged : {
                 addListener : <function>

Modified: trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt (100144 => 100145)


--- trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt	2011-11-14 16:29:34 UTC (rev 100145)
@@ -11,12 +11,14 @@
 onRequestFinished fired
 RUNNING TEST: extension_testOnSelectionChanged
 onSelectionChanged fired
-RUNNING TEST: extension_testPanelShowHide
-Got onHidden event for panel elements
-Got onShown event for panel extension
-Got onHidden event for panel extension
-Got onShown event for panel elements
 RUNNING TEST: extension_testTimelineEvents
 Got Layout event from timeline
+RUNNING TEST: extension_testViewShowHide
+Got onHidden event for sidebar
+Got onShown event for panel
+Panel shown, location: .../extension-panel.html
+Got onHidden event for panel
+Got onShown event for sidebar
+Sidebar shown, location: .../extension-sidebar.html
 All tests done.
 

Modified: trunk/LayoutTests/inspector/extensions/extensions-events.html (100144 => 100145)


--- trunk/LayoutTests/inspector/extensions/extensions-events.html	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/LayoutTests/inspector/extensions/extensions-events.html	2011-11-14 16:29:34 UTC (rev 100145)
@@ -63,26 +63,30 @@
     webInspector.inspectedWindow.eval("location.href = "" + '?navigated'");
 }
 
-function extension_testPanelShowHide(nextTest)
+function extension_testViewShowHide(nextTest)
 {
     var listenersToCleanup = [];
-    function onPanelEvent(type, panelId)
+    var sidebar;
+
+    function onViewEvent(type, viewName, viewWindow)
     {
-        output("Got " + type + " event for panel " + panelId);
+        output("Got " + type + " event for " + viewName);
         if (type !== "onShown")
             return;
-        if (panelId === "extension") {
-            addListener(webInspector.panels.elements, "elements", "onShown");
+        if (viewName === "panel") {
+            output("Panel shown, location: " + trimURL(viewWindow.location.href));
+            addListener(sidebar, "sidebar", "onShown");
             extension_showPanel("elements");
-        } else if (panelId === "elements") {
+        } else if (viewName === "sidebar") {
+            output("Sidebar shown, location: " + trimURL(viewWindow.location.href));
             cleanupListeners();
             nextTest();
         }
     }
-    function addListener(panel, panelId, type)
+    function addListener(view, viewName, type)
     {
-        var listener = bind(onPanelEvent, null, type, panelId);
-        var event = panel[type];
+        var listener = bind(onViewEvent, null, type, viewName);
+        var event = view[type];
         listenersToCleanup.push({ event: event, listener: listener });
         event.addListener(listener);
     }
@@ -93,13 +97,20 @@
     }
     function onPanelCreated(panel)
     {
-        addListener(panel, "extension", "onShown");
-        addListener(panel, "extension", "onHidden");
-        addListener(webInspector.panels.elements, "elements", "onHidden");
+        addListener(panel, "panel", "onShown");
+        addListener(panel, "panel", "onHidden");
+        addListener(sidebar, "sidebar", "onHidden");
+        sidebar.setPage(basePath + "extension-sidebar.html");
         extension_showPanel("extension");
     }
     extension_showPanel("elements");
-    webInspector.panels.create("Test Panel", "extension-panel.png", "extension-panel.html", onPanelCreated);
+    var basePath = location.pathname.replace(/\/[^/]*$/, "/");
+    function onSidebarCreated(sidebarPane)
+    {
+        sidebar = sidebarPane;
+        webInspector.panels.create("Test Panel", basePath + "extension-panel.png", basePath + "extension-panel.html", onPanelCreated);
+    }
+    webInspector.panels.elements.createSidebarPane("Test Sidebar", onSidebarCreated);
 }
 
 function extension_testTimelineEvents(nextTest)

Modified: trunk/LayoutTests/inspector/extensions/extensions-expected.txt (100144 => 100145)


--- trunk/LayoutTests/inspector/extensions/extensions-expected.txt	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/LayoutTests/inspector/extensions/extensions-expected.txt	2011-11-14 16:29:34 UTC (rev 100145)
@@ -22,6 +22,14 @@
 RUNNING TEST: extension_testSidebarPage
 Sidebar created
 {
+    onShown : {
+        addListener : <function>
+        removeListener : <function>
+    }
+    onHidden : {
+        addListener : <function>
+        removeListener : <function>
+    }
     onUpdated : {
         addListener : <function>
         removeListener : <function>
@@ -37,6 +45,14 @@
 Watch sidebar created, callback arguments dump follows:
 {
     0 : {
+        onShown : {
+            addListener : <function>
+            removeListener : <function>
+        }
+        onHidden : {
+            addListener : <function>
+            removeListener : <function>
+        }
         onUpdated : {
             addListener : <function>
             removeListener : <function>

Modified: trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt (100144 => 100145)


--- trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt	2011-11-14 16:29:34 UTC (rev 100145)
@@ -23,14 +23,6 @@
     }
     panels : {
         elements : {
-            onShown : {
-                addListener : <function>
-                removeListener : <function>
-            }
-            onHidden : {
-                addListener : <function>
-                removeListener : <function>
-            }
             createSidebarPane : <function>
             onSelectionChanged : {
                 addListener : <function>

Modified: trunk/Source/WebCore/ChangeLog (100144 => 100145)


--- trunk/Source/WebCore/ChangeLog	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/ChangeLog	2011-11-14 16:29:34 UTC (rev 100145)
@@ -1,3 +1,42 @@
+2011-11-14  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose iframe window to the onShown event handler of panels & sidebars
+        https://bugs.webkit.org/show_bug.cgi?id=72268
+
+        Reviewed by Pavel Feldman.
+
+        - replace IFrameView with ExtensionView;
+        - inherit both ExtensionPanel and ExtensionSidebarPane from ExtensionView in the API;
+        - move Panel.{onShow|onHide} to ExtensionView, effectively disabling show/hide notifications for non-extension panels and enabling it for sidebar panes;
+        - expose iframe's window object in the onShow event handler.
+
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * inspector/compile-front-end.sh:
+        * inspector/front-end/ExtensionAPI.js:
+        (injectedExtensionAPI.ExtensionViewImpl.dispatchShowEvent):
+        (injectedExtensionAPI):
+        (injectedExtensionAPI.PanelWithSidebarImpl):
+        (injectedExtensionAPI.ExtensionPanelImpl):
+        (injectedExtensionAPI.ExtensionSidebarPaneImpl):
+        * inspector/front-end/ExtensionPanel.js:
+        (WebInspector.ExtensionView):
+        (WebInspector.ExtensionView.prototype.wasShown):
+        (WebInspector.ExtensionView.prototype.willHide):
+        (WebInspector.ExtensionView.prototype._onLoad):
+        (WebInspector.ExtensionPanel):
+        (WebInspector.ExtensionSidebarPane.prototype.setPage):
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer.prototype.notifyViewShown):
+        (WebInspector.ExtensionServer.prototype.notifyViewHidden):
+        (WebInspector.ExtensionServer.prototype._onCreatePanel):
+        * inspector/front-end/IFrameView.js: Removed.
+        * inspector/front-end/Panel.js:
+        (WebInspector.Panel.prototype.wasShown):
+        (WebInspector.Panel.prototype.willHide):
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.html:
+
 2011-11-14  Yury Semikhatsky  <[email protected]>
 
         Web Inspector: add 'Show function definition' context menu item for function values

Modified: trunk/Source/WebCore/WebCore.gypi (100144 => 100145)


--- trunk/Source/WebCore/WebCore.gypi	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/WebCore.gypi	2011-11-14 16:29:34 UTC (rev 100145)
@@ -6347,7 +6347,6 @@
             'inspector/front-end/HeapSnapshotWorker.js',
             'inspector/front-end/HeapSnapshotWorkerDispatcher.js',
             'inspector/front-end/HelpScreen.js',
-            'inspector/front-end/IFrameView.js',
             'inspector/front-end/ImageView.js',
             'inspector/front-end/InspectorFrontendHostStub.js',
             'inspector/front-end/InspectorView.js',

Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (100144 => 100145)


--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2011-11-14 16:29:34 UTC (rev 100145)
@@ -68953,10 +68953,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\inspector\front-end\IFrameView.js"
-					>
-				</File>
-				<File
 					RelativePath="..\inspector\front-end\ImageView.js"
 					>
 				</File>

Modified: trunk/Source/WebCore/inspector/compile-front-end.sh (100144 => 100145)


--- trunk/Source/WebCore/inspector/compile-front-end.sh	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/compile-front-end.sh	2011-11-14 16:29:34 UTC (rev 100145)
@@ -71,7 +71,7 @@
         --js Source/WebCore/inspector/front-end/Resource.js \
         --js Source/WebCore/inspector/front-end/NetworkManager.js \
         --js Source/WebCore/inspector/front-end/UISourceCode.js \
-    --module jsmodule_ui:36:jsmodule_common \
+    --module jsmodule_ui:35:jsmodule_common \
         --js Source/WebCore/inspector/front-end/AdvancedSearchController.js \
         --js Source/WebCore/inspector/front-end/Checkbox.js \
         --js Source/WebCore/inspector/front-end/Color.js \
@@ -82,7 +82,6 @@
         --js Source/WebCore/inspector/front-end/Drawer.js \
         --js Source/WebCore/inspector/front-end/EmptyView.js \
         --js Source/WebCore/inspector/front-end/HelpScreen.js \
-        --js Source/WebCore/inspector/front-end/IFrameView.js \
         --js Source/WebCore/inspector/front-end/InspectorView.js \
         --js Source/WebCore/inspector/front-end/KeyboardShortcut.js \
         --js Source/WebCore/inspector/front-end/Panel.js \

Modified: trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js	2011-11-14 16:29:34 UTC (rev 100145)
@@ -274,20 +274,25 @@
 /**
  * @constructor
  */
-function PanelImpl(id)
+function ExtensionViewImpl(id)
 {
     this._id = id;
-    this._onShown_ = new EventSink("panel-shown-" + id);
-    this._onHidden_ = new EventSink("panel-hidden-" + id);
+
+    function dispatchShowEvent(message)
+    {
+        var frameIndex = message.arguments[0];
+        this._fire(window.top.frames[frameIndex]);
+    }
+    this._onShown_ = new EventSink("view-shown-" + id, dispatchShowEvent);
+    this._onHidden_ = new EventSink("view-hidden-" + id);
 }
 
 /**
  * @constructor
- * @extends {PanelImpl}
  */
 function PanelWithSidebarImpl(id)
 {
-    PanelImpl.call(this, id);
+    this._id = id;
 }
 
 PanelWithSidebarImpl.prototype = {
@@ -308,7 +313,7 @@
     }
 }
 
-PanelWithSidebarImpl.prototype.__proto__ = PanelImpl.prototype;
+PanelWithSidebarImpl.prototype.__proto__ = ExtensionViewImpl.prototype;
 
 /**
  * @constructor
@@ -323,20 +328,23 @@
 
 /**
  * @constructor
- * @extends {Panel}
+ * @extends {ExtensionViewImpl}
  */
-function ExtensionPanel(id)
+function ExtensionPanelImpl(id)
 {
-    Panel.call(this, id);
+    ExtensionViewImpl.call(this, id);
     this._onSearch_ = new EventSink("panel-search-" + id);
 }
 
+ExtensionPanelImpl.prototype.__proto__ = ExtensionViewImpl.prototype;
+
 /**
  * @constructor
+ * @extends {ExtensionViewImpl}
  */
 function ExtensionSidebarPaneImpl(id)
 {
-    this._id = id;
+    ExtensionViewImpl.call(this, id);
     this._onUpdated_ = new EventSink("sidebar-updated-" + id);
 }
 
@@ -698,8 +706,8 @@
 var AuditCategory = declareInterfaceClass(AuditCategoryImpl);
 var AuditResult = declareInterfaceClass(AuditResultImpl);
 var EventSink = declareInterfaceClass(EventSinkImpl);
+var ExtensionPanel = declareInterfaceClass(ExtensionPanelImpl);
 var ExtensionSidebarPane = declareInterfaceClass(ExtensionSidebarPaneImpl);
-var Panel = declareInterfaceClass(PanelImpl);
 var PanelWithSidebar = declareInterfaceClass(PanelWithSidebarImpl);
 var Request = declareInterfaceClass(RequestImpl);
 var Resource = declareInterfaceClass(ResourceImpl);

Modified: trunk/Source/WebCore/inspector/front-end/ExtensionPanel.js (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/ExtensionPanel.js	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionPanel.js	2011-11-14 16:29:34 UTC (rev 100145)
@@ -30,21 +30,68 @@
 
 /**
  * @constructor
+ * @extends {WebInspector.View}
+ * @param {number} id
+ * @param {Element} parent
+ * @param {string} src
+ * @param {string} className
+ */
+
+WebInspector.ExtensionView = function(id, parent, src, className)
+{
+    WebInspector.View.call(this);
+    this.element.className = "fill";
+
+    this._id = id;
+    this._iframe = document.createElement("iframe");
+    this._iframe.addEventListener("load", this._onLoad.bind(this), false);
+    this._iframe.src = ""
+    this._iframe.className = className;
+
+    this.element.appendChild(this._iframe);
+    this.show(parent);
+}
+
+WebInspector.ExtensionView.prototype = {
+    wasShown: function()
+    {
+        if (typeof this._frameIndex === "number")
+            WebInspector.extensionServer.notifyViewShown(this._id, this._frameIndex);
+    },
+
+    willHide: function()
+    {
+        if (typeof this._frameIndex === "number")
+            WebInspector.extensionServer.notifyViewHidden(this._id);
+    },
+
+    _onLoad: function()
+    {
+        this._frameIndex = Array.prototype.indexOf.call(window.frames, this._iframe.contentWindow);
+        if (this.isShowing())
+            WebInspector.extensionServer.notifyViewShown(this._id, this._frameIndex);
+    }
+}
+
+WebInspector.ExtensionView.prototype.__proto__ = WebInspector.View.prototype;
+
+/**
+ * @constructor
  * @extends {WebInspector.Panel}
  * @param {string} id
  * @param {string} label
  * @param {string} iconURL
  */
-WebInspector.ExtensionPanel = function(id, label, iconURL)
+WebInspector.ExtensionPanel = function(id, label, pageURL, iconURL)
 {
     WebInspector.Panel.call(this, id);
     this.setHideOnDetach();
-
     this._toolbarItemLabel = label;
     if (iconURL) {
         this._addStyleRule(".toolbar-item." + id + " .toolbar-icon", "background-image: url(" + iconURL + ");");
         this._addStyleRule(".toolbar-small .toolbar-item." + id + " .toolbar-icon", "background-position-x: -32px;");
     }
+    new WebInspector.ExtensionView(id, this.element, pageURL, "extension panel");
 }
 
 WebInspector.ExtensionPanel.prototype = {
@@ -118,7 +165,7 @@
     setPage: function(url)
     {
         this.bodyElement.removeChildren();
-        WebInspector.extensionServer.createClientIframe(this.bodyElement, url);
+        var view = new WebInspector.ExtensionView(this._id, this.bodyElement, url, "extension");
         // TODO: Consider doing this upon load event.
         WebInspector.extensionServer.notifyExtensionSidebarUpdated(this._id);
     },

Modified: trunk/Source/WebCore/inspector/front-end/ExtensionServer.js (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/ExtensionServer.js	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionServer.js	2011-11-14 16:29:34 UTC (rev 100145)
@@ -81,14 +81,14 @@
         this._postNotification("panel-search-" + panelId, action, searchString);
     },
 
-    notifyPanelShown: function(panelId)
+    notifyViewShown: function(identifier, frameIndex)
     {
-        this._postNotification("panel-shown-" + panelId);
+        this._postNotification("view-shown-" + identifier, frameIndex);
     },
 
-    notifyPanelHidden: function(panelId)
+    notifyViewHidden: function(identifier)
     {
-        this._postNotification("panel-hidden-" + panelId);
+        this._postNotification("view-hidden-" + identifier);
     },
 
     _inspectedURLChanged: function(event)
@@ -196,12 +196,12 @@
         if (id in this._clientObjects || id in WebInspector.panels)
             return this._status.E_EXISTS(id);
 
-        var panel = new WebInspector.ExtensionPanel(id, message.title, this._expandResourcePath(port._extensionOrigin, message.icon));
+        var page = this._expandResourcePath(port._extensionOrigin, message.page);
+        var icon = this._expandResourcePath(port._extensionOrigin, message.icon)
+        var panel = new WebInspector.ExtensionPanel(id, message.title, page, icon);
         this._clientObjects[id] = panel;
         WebInspector.panels[id] = panel;
         WebInspector.addPanel(panel);
-
-        this.createClientIframe(panel.element, this._expandResourcePath(port._extensionOrigin, message.page), true);
         return this._status.OK();
     },
 
@@ -221,12 +221,6 @@
         return this._status.OK();
     },
 
-    createClientIframe: function(parent, url, isPanel)
-    {
-        var iframeView = new WebInspector.IFrameView(url, "extension" + (isPanel ? " panel" : ""));
-        iframeView.show(parent);
-    },
-
     _onSetSidebarHeight: function(message)
     {
         var sidebar = this._clientObjects[message.id];

Deleted: trunk/Source/WebCore/inspector/front-end/IFrameView.js (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/IFrameView.js	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/IFrameView.js	2011-11-14 16:29:34 UTC (rev 100145)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 Google 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-/**
- * @constructor
- * @extends {WebInspector.View}
- * @param {string} src
- * @param {string=} className
- */
-WebInspector.IFrameView = function(src, className)
-{
-    WebInspector.View.call(this);
-    this.element.className = "fill";
-
-    this._iframe = document.createElement("iframe");
-    this._iframe.src = ""
-    if (className)
-        this._iframe.className = className;
-    this.element.appendChild(this._iframe);
-}
-
-WebInspector.IFrameView.prototype.__proto__ = WebInspector.View.prototype;

Modified: trunk/Source/WebCore/inspector/front-end/Panel.js (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/Panel.js	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/Panel.js	2011-11-14 16:29:34 UTC (rev 100145)
@@ -82,7 +82,6 @@
         WebInspector.setCurrentFocusElement(this.defaultFocusedElement);
 
         this.restoreSidebarWidth();
-        WebInspector.extensionServer.notifyPanelShown(this.name);
     },
 
     willHide: function()
@@ -92,7 +91,6 @@
         delete this._statusBarItemContainer;
         if ("_toolbarItem" in this)
             this._toolbarItem.removeStyleClass("toggled-on");
-        WebInspector.extensionServer.notifyPanelHidden(this.name);
     },
 
     reset: function()

Modified: trunk/Source/WebCore/inspector/front-end/WebKit.qrc (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/WebKit.qrc	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/WebKit.qrc	2011-11-14 16:29:34 UTC (rev 100145)
@@ -63,7 +63,6 @@
     <file>HeapSnapshotWorker.js</file>
     <file>HeapSnapshotWorkerDispatcher.js</file>
     <file>HelpScreen.js</file>
-    <file>IFrameView.js</file>
     <file>ImageView.js</file>
     <file>InjectedFakeWorker.js</file>
     <file>inspector.js</file>

Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (100144 => 100145)


--- trunk/Source/WebCore/inspector/front-end/inspector.html	2011-11-14 16:22:43 UTC (rev 100144)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html	2011-11-14 16:29:34 UTC (rev 100145)
@@ -54,7 +54,6 @@
     <script type="text/_javascript_" src=""
     <script type="text/_javascript_" src=""
     <script type="text/_javascript_" src=""
-    <script type="text/_javascript_" src=""
     <script type="text/_javascript_" src=""
     <script type="text/_javascript_" src=""
     <script type="text/_javascript_" src=""
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to