Changeset 99417 in webkit

Timestamp:

Nov 7, 2011, 6:30:41 AM (15 years ago)

Author:

yurys@chromium.org

Message:

[Chromium] Web Inspector: use native worker inspector instead of fake workers
​https://bugs.webkit.org/show_bug.cgi?id=71670

Source/WebCore:

Removed context menu option for switching between native and "fake" workers
debugger. Native debugger is used by default on platforms that support it.

Reviewed by Pavel Feldman.

• English.lproj/localizedStrings.js:
• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._toggleFormatSource):

• inspector/front-end/Settings.js:

(WebInspector.Settings):

• inspector/front-end/WorkersSidebarPane.js:

(WebInspector.WorkerListSidebarPane):
(WebInspector.WorkerListSidebarPane.prototype._autoattachToWorkersClicked):

• inspector/front-end/scriptsPanel.css:

(#shared-workers-list):

Source/WebKit/chromium:

chrome://workers link is replaced with instructions on discovering shared workers
in Task Manager.

Reviewed by Pavel Feldman.

• src/js/DevTools.js:

():

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/English.lproj/localizedStrings.js (modified) ( previous)
• WebCore/inspector/front-end/ScriptsPanel.js (modified) (2 diffs)
• WebCore/inspector/front-end/Settings.js (modified) (2 diffs)
• WebCore/inspector/front-end/WorkersSidebarPane.js (modified) (2 diffs)
• WebCore/inspector/front-end/scriptsPanel.css (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/js/DevTools.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-07  Yury Semikhatsky  <yurys@chromium.org>
+
+        [Chromium] Web Inspector: use native worker inspector instead of fake workers
+        https://bugs.webkit.org/show_bug.cgi?id=71670
+
+        Removed context menu option for switching between native and "fake" workers
+        debugger. Native debugger is used by default on platforms that support it.
+
+        Reviewed by Pavel Feldman.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._toggleFormatSource):
+        * inspector/front-end/Settings.js:
+        (WebInspector.Settings):
+        * inspector/front-end/WorkersSidebarPane.js:
+        (WebInspector.WorkerListSidebarPane):
+        (WebInspector.WorkerListSidebarPane.prototype._autoattachToWorkersClicked):
+        * inspector/front-end/scriptsPanel.css:
+        (#shared-workers-list):
+
 2011-11-07  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -118 +118 @@
     }
 
-    if (Preferences.canInspectWorkers && WebInspector.workerManager)
-        this.sidebarElement.addEventListener("contextmenu", this._contextMenu.bind(this), false);
-    if (Preferences.canInspectWorkers && WebInspector.workerManager && WebInspector.settings.workerInspectionEnabled.get()) {
+    if (Preferences.canInspectWorkers && WebInspector.workerManager) {
         WorkerAgent.setWorkerInspectionEnabled(true);
         this.sidebarPanes.workerList = new WebInspector.WorkerListSidebarPane(WebInspector.workerManager);
@@ -1147 +1145 @@
         this._toggleFormatSourceButton.toggled = !this._toggleFormatSourceButton.toggled;
         this._presentationModel.setFormatSource(this._toggleFormatSourceButton.toggled);
-    },
-
-    _contextMenu: function(event)
-    {
-        var contextMenu = new WebInspector.ContextMenu();
-
-        function enableWorkerInspection()
-        {
-            var newValue = !WebInspector.settings.workerInspectionEnabled.get();
-            WebInspector.settings.workerInspectionEnabled.set(newValue);
-            WorkerAgent.setWorkerInspectionEnabled(newValue);
-            if (newValue) {
-                var element = this.sidebarPanes.workers.element;
-                delete this.sidebarPanes.workers;
-                this.sidebarPanes.workerList = new WebInspector.WorkerListSidebarPane(WebInspector.workerManager);
-                element.parentNode.replaceChild(this.sidebarPanes.workerList.element, element);
-            } else {
-                var element = this.sidebarPanes.workerList.element;
-                delete this.sidebarPanes.workerList;
-                this.sidebarPanes.workers = new WebInspector.WorkersSidebarPane();
-                element.parentNode.replaceChild(this.sidebarPanes.workers.element, element);
-            }
-        }
-        contextMenu.appendCheckboxItem(WebInspector.UIString("Enable worker inspection"), enableWorkerInspection.bind(this), WebInspector.settings.workerInspectionEnabled.get());
-
-        contextMenu.show(event);
     }
 }

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

@@ -58 +58 @@
     showNetworkPanelInitiatorColumn: false,
     haveExtensions: false,
-    sharedWorkersListURL: undefined,
+    sharedWorkersDebugNote: undefined,
     localizeUI: true
 }
@@ -89 +89 @@
     this.domBreakpoints = this.createSetting("domBreakpoints", []);
     this.xhrBreakpoints = this.createSetting("xhrBreakpoints", []);
-    this.workerInspectionEnabled = this.createSetting("workerInspectionEnabled", []);
     this.cacheDisabled = this.createSetting("cacheDisabled", false);
     this.overrideUserAgent = this.createSetting("overrideUserAgent", "");

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

@@ -138 +138 @@
     this._enableWorkersCheckbox.checked = false;
 
-    if (Preferences.sharedWorkersListURL) {
-        var link = this._createSharedWorkersLink(Preferences.sharedWorkersListURL)
-        this.bodyElement.appendChild(link);
+    if (Preferences.sharedWorkersDebugNote) {
+        var note = this.bodyElement.createChild("div");
+        note.id = "shared-workers-list";
+        note.addStyleClass("sidebar-label")
+        note.textContent = Preferences.sharedWorkersDebugNote;
     }
 
@@ -199 +201 @@
     {
         WorkerAgent.setAutoconnectToWorkers(event.target.checked);
-    },
-
-    _createSharedWorkersLink: function(url)
-    {
-        var linkBlock = document.createElement("div");
-        linkBlock.id = "shared-workers-list";
-        linkBlock.addStyleClass("sidebar-label");
-        linkBlock.title = WebInspector.UIString("Open a page with list of all shared workers");
-
-        var link = linkBlock.createChild("a");
-        link.href = "#";
-        link.textContent = WebInspector.UIString("Discover shared workers");
-        link.target = "_blank";
-        link.onclick = function(event) {
-            PageAgent.open(url, true);
-            event.preventDefault();
-        };
-        return linkBlock;
     }
 }

trunk/Source/WebCore/inspector/front-end/scriptsPanel.css

@@ -180 +180 @@
 #shared-workers-list {
     margin: 5px 0px 5px 20px;
+    font-style:italic;
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-07  Yury Semikhatsky  <yurys@chromium.org>
+
+        [Chromium] Web Inspector: use native worker inspector instead of fake workers
+        https://bugs.webkit.org/show_bug.cgi?id=71670
+
+        chrome://workers link is replaced with instructions on discovering shared workers
+        in Task Manager.
+
+        Reviewed by Pavel Feldman.
+
+        * src/js/DevTools.js:
+        ():
+
 2011-11-07  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/js/DevTools.js

@@ -58 +58 @@
     Preferences.showNetworkPanelInitiatorColumn = true;
     Preferences.haveExtensions = true;
-    Preferences.sharedWorkersListURL = "chrome://workers/";
+    Preferences.sharedWorkersDebugNote = "Shared workers can be inspected in the Task Manager";
     Preferences.localizeUI = false;
 })();