Title: [97868] trunk/Source/WebCore
- Revision
- 97868
- Author
- [email protected]
- Date
- 2011-10-19 10:02:53 -0700 (Wed, 19 Oct 2011)
Log Message
Web Inspector: worker inspector title should contain worker URL
https://bugs.webkit.org/show_bug.cgi?id=70424
Worker inspector title is now evaluated when the front-end starts.
Reviewed by Pavel Feldman.
* inspector/front-end/WorkerManager.js:
(WebInspector.WorkerManager.loaded):
(WebInspector.WorkerManager._calculateWorkerInspectorTitle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97867 => 97868)
--- trunk/Source/WebCore/ChangeLog 2011-10-19 16:29:56 UTC (rev 97867)
+++ trunk/Source/WebCore/ChangeLog 2011-10-19 17:02:53 UTC (rev 97868)
@@ -1,3 +1,16 @@
+2011-10-19 Yury Semikhatsky <[email protected]>
+
+ Web Inspector: worker inspector title should contain worker URL
+ https://bugs.webkit.org/show_bug.cgi?id=70424
+
+ Worker inspector title is now evaluated when the front-end starts.
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/WorkerManager.js:
+ (WebInspector.WorkerManager.loaded):
+ (WebInspector.WorkerManager._calculateWorkerInspectorTitle):
+
2011-10-19 Martin Robinson <[email protected]>
[GTK] Avoid unecessarily calling gtk_widget_size_allocate on plugin widgets
Modified: trunk/Source/WebCore/inspector/front-end/WorkerManager.js (97867 => 97868)
--- trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-10-19 16:29:56 UTC (rev 97867)
+++ trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-10-19 17:02:53 UTC (rev 97868)
@@ -47,11 +47,17 @@
WebInspector.WorkerManager.loaded = function()
{
var workerId = WebInspector.queryParamsObject["dedicatedWorkerId"];
- if (!workerId) {
+ if (workerId)
+ WebInspector.WorkerManager._initializeDedicatedWorkerFrontend(workerId);
+ else
WebInspector.workerManager = new WebInspector.WorkerManager();
- return;
- }
+ if (WebInspector.WorkerManager.isWorkerFrontend())
+ WebInspector.WorkerManager._calculateWorkerInspectorTitle();
+}
+
+WebInspector.WorkerManager._initializeDedicatedWorkerFrontend = function(workerId)
+{
function receiveMessage(event)
{
var message = event.data;
@@ -71,6 +77,22 @@
}
}
+WebInspector.WorkerManager._calculateWorkerInspectorTitle = function()
+{
+ var _expression_ = "location.href";
+ if (WebInspector.queryParamsObject["isSharedWorker"])
+ _expression_ += " + (this.name ? ' (' + this.name + ')' : '')";
+ RuntimeAgent.evaluate.invoke({_expression_:_expression_, doNotPauseOnExceptions:true, returnByValue: true}, evalCallback.bind(this));
+ function evalCallback(error, result, wasThrown)
+ {
+ if (error || wasThrown) {
+ console.error(error);
+ return;
+ }
+ InspectorFrontendHost.inspectedURLChanged(result.value);
+ }
+}
+
WebInspector.WorkerManager.Events = {
WorkerAdded: "worker-added",
WorkerRemoved: "worker-removed",
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
