Title: [90988] trunk/Source/WebCore
- Revision
- 90988
- Author
- [email protected]
- Date
- 2011-07-14 02:16:44 -0700 (Thu, 14 Jul 2011)
Log Message
Web Inspector: show only Console and Scripts panels in shared worker inspector front-end
https://bugs.webkit.org/show_bug.cgi?id=64519
Reviewed by Pavel Feldman.
* inspector/front-end/WorkerManager.js:
(WebInspector.WorkerManager):
(WebInspector.WorkerManager.isWorkerFrontend):
(WebInspector.WorkerManager.isSharedWorkerFrontend):
(WebInspector.WorkerManager.prototype._openInspectorWindow):
(WebInspector.DedicatedWorkerMessageForwarder):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90987 => 90988)
--- trunk/Source/WebCore/ChangeLog 2011-07-14 09:00:26 UTC (rev 90987)
+++ trunk/Source/WebCore/ChangeLog 2011-07-14 09:16:44 UTC (rev 90988)
@@ -1,3 +1,17 @@
+2011-07-14 Yury Semikhatsky <[email protected]>
+
+ Web Inspector: show only Console and Scripts panels in shared worker inspector front-end
+ https://bugs.webkit.org/show_bug.cgi?id=64519
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/WorkerManager.js:
+ (WebInspector.WorkerManager):
+ (WebInspector.WorkerManager.isWorkerFrontend):
+ (WebInspector.WorkerManager.isSharedWorkerFrontend):
+ (WebInspector.WorkerManager.prototype._openInspectorWindow):
+ (WebInspector.DedicatedWorkerMessageForwarder):
+
2011-07-14 MORITA Hajime <[email protected]>
Unreviewed, rolling out r90976, r90981, and r90985.
Modified: trunk/Source/WebCore/inspector/front-end/WorkerManager.js (90987 => 90988)
--- trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-07-14 09:00:26 UTC (rev 90987)
+++ trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-07-14 09:16:44 UTC (rev 90988)
@@ -31,17 +31,18 @@
WebInspector.WorkerManager = function()
{
this._workerIdToWindow = {};
- InspectorBackend.registerDomainDispatcher("Worker", new WebInspector.WorkerMessageForwarder(this));
+ InspectorBackend.registerDomainDispatcher("Worker", new WebInspector.DedicatedWorkerMessageForwarder(this));
}
WebInspector.WorkerManager.isWorkerFrontend = function()
{
- return !!WebInspector.queryParamsObject["workerId"];
+ return !!WebInspector.queryParamsObject["dedicatedWorkerId"] ||
+ !!WebInspector.queryParamsObject["isSharedWorker"];
}
WebInspector.WorkerManager.loaded = function()
{
- var workerId = WebInspector.queryParamsObject["workerId"];
+ var workerId = WebInspector.queryParamsObject["dedicatedWorkerId"];
if (!workerId) {
WebInspector.workerManager = new WebInspector.WorkerManager();
return;
@@ -102,7 +103,7 @@
_openInspectorWindow: function(workerId)
{
- var url = "" + "&workerId=" + workerId;
+ var url = "" + "&dedicatedWorkerId=" + workerId;
url = "" "");
var workerInspectorWindow = window.open(url);
this._workerIdToWindow[workerId] = workerInspectorWindow;
@@ -133,13 +134,13 @@
WebInspector.WorkerManager.prototype.__proto__ = WebInspector.Object.prototype;
-WebInspector.WorkerMessageForwarder = function(workerManager)
+WebInspector.DedicatedWorkerMessageForwarder = function(workerManager)
{
this._workerManager = workerManager;
window.addEventListener("message", this._receiveMessage.bind(this), true);
}
-WebInspector.WorkerMessageForwarder.prototype = {
+WebInspector.DedicatedWorkerMessageForwarder.prototype = {
_receiveMessage: function(event)
{
var workerId = event.data.workerId;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
