Diff
Modified: trunk/Source/WebCore/ChangeLog (99416 => 99417)
--- trunk/Source/WebCore/ChangeLog 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebCore/ChangeLog 2011-11-07 14:30:41 UTC (rev 99417)
@@ -1,3 +1,24 @@
+2011-11-07 Yury Semikhatsky <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: Add advanced search shortcut to ShortcutsScreen.
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js
(Binary files differ)
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (99416 => 99417)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-11-07 14:30:41 UTC (rev 99417)
@@ -117,9 +117,7 @@
this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
}
- 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);
} else
@@ -1146,32 +1144,6 @@
{
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);
}
}
Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (99416 => 99417)
--- trunk/Source/WebCore/inspector/front-end/Settings.js 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js 2011-11-07 14:30:41 UTC (rev 99417)
@@ -57,7 +57,7 @@
canDisableCache: false,
showNetworkPanelInitiatorColumn: false,
haveExtensions: false,
- sharedWorkersListURL: undefined,
+ sharedWorkersDebugNote: undefined,
localizeUI: true
}
@@ -88,7 +88,6 @@
this.eventListenerBreakpoints = this.createSetting("eventListenerBreakpoints", []);
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", "");
this.userAgent = this.createSetting("userAgent", "");
Modified: trunk/Source/WebCore/inspector/front-end/WorkersSidebarPane.js (99416 => 99417)
--- trunk/Source/WebCore/inspector/front-end/WorkersSidebarPane.js 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebCore/inspector/front-end/WorkersSidebarPane.js 2011-11-07 14:30:41 UTC (rev 99417)
@@ -137,9 +137,11 @@
this._enableWorkersCheckbox.addEventListener(this._autoattachToWorkersClicked.bind(this));
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;
}
var separator = this.bodyElement.createChild("div", "sidebar-separator");
@@ -198,24 +200,6 @@
_autoattachToWorkersClicked: function(event)
{
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;
}
}
Modified: trunk/Source/WebCore/inspector/front-end/scriptsPanel.css (99416 => 99417)
--- trunk/Source/WebCore/inspector/front-end/scriptsPanel.css 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebCore/inspector/front-end/scriptsPanel.css 2011-11-07 14:30:41 UTC (rev 99417)
@@ -179,6 +179,7 @@
#shared-workers-list {
margin: 5px 0px 5px 20px;
+ font-style:italic;
}
#pause-workers-checkbox > input {
Modified: trunk/Source/WebKit/chromium/ChangeLog (99416 => 99417)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-07 14:30:41 UTC (rev 99417)
@@ -1,3 +1,16 @@
+2011-11-07 Yury Semikhatsky <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/src/js/DevTools.js (99416 => 99417)
--- trunk/Source/WebKit/chromium/src/js/DevTools.js 2011-11-07 14:20:23 UTC (rev 99416)
+++ trunk/Source/WebKit/chromium/src/js/DevTools.js 2011-11-07 14:30:41 UTC (rev 99417)
@@ -57,7 +57,7 @@
Preferences.canDisableCache = true;
Preferences.showNetworkPanelInitiatorColumn = true;
Preferences.haveExtensions = true;
- Preferences.sharedWorkersListURL = "chrome://workers/";
+ Preferences.sharedWorkersDebugNote = "Shared workers can be inspected in the Task Manager";
Preferences.localizeUI = false;
})();
