summaryrefslogtreecommitdiff
path: root/Source/WebCore/inspector/front-end/WorkerManager.js
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebCore/inspector/front-end/WorkerManager.js
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebCore/inspector/front-end/WorkerManager.js')
-rw-r--r--Source/WebCore/inspector/front-end/WorkerManager.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebCore/inspector/front-end/WorkerManager.js b/Source/WebCore/inspector/front-end/WorkerManager.js
index 7b3b72b58..c9f053dc4 100644
--- a/Source/WebCore/inspector/front-end/WorkerManager.js
+++ b/Source/WebCore/inspector/front-end/WorkerManager.js
@@ -98,7 +98,13 @@ 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));
+ RuntimeAgent.evaluate.invoke({expression:expression, doNotPauseOnExceptionsAndMuteConsole:true, returnByValue: true}, evalCallback.bind(this));
+
+ /**
+ * @param {?Protocol.Error} error
+ * @param {RuntimeAgent.RemoteObject} result
+ * @param {boolean=} wasThrown
+ */
function evalCallback(error, result, wasThrown)
{
if (error || wasThrown) {
@@ -189,6 +195,8 @@ WebInspector.WorkerManager.prototype = {
_workerInspectorClosing: function(workerId, event)
{
+ if (event.target.location.href === "about:blank")
+ return;
if (this._ignoreWorkerInspectorClosing)
return;
delete this._workerIdToWindow[workerId];