| Index: Source/devtools/front_end/main/Main.js
|
| diff --git a/Source/devtools/front_end/main/Main.js b/Source/devtools/front_end/main/Main.js
|
| index 6811b86cca3dbc7454a91d2ca95aecb53de027f7..59bd0291c0bf2b272a3a1e65435ce22e7f975ac4 100644
|
| --- a/Source/devtools/front_end/main/Main.js
|
| +++ b/Source/devtools/front_end/main/Main.js
|
| @@ -307,31 +307,34 @@ WebInspector.Main.prototype = {
|
| _mainTargetCreated: function(target)
|
| {
|
| console.timeStamp("Main._mainTargetCreated");
|
| -
|
| - var mainTarget = /** @type {!WebInspector.Target} */(target);
|
| + this._mainTarget = /** @type {!WebInspector.Target} */(target);
|
| this._registerShortcuts();
|
|
|
| - WebInspector.workerTargetManager = new WebInspector.WorkerTargetManager(mainTarget, WebInspector.targetManager);
|
| + WebInspector.workerTargetManager = new WebInspector.WorkerTargetManager(this._mainTarget, WebInspector.targetManager);
|
|
|
| - mainTarget.registerInspectorDispatcher(this);
|
| + this._mainTarget.registerInspectorDispatcher(this);
|
|
|
| if (WebInspector.isWorkerFrontend()) {
|
| - mainTarget.runtimeAgent().run();
|
| - mainTarget.workerManager.addEventListener(WebInspector.WorkerManager.Events.WorkerDisconnected, onWorkerDisconnected);
|
| + this._mainTarget.runtimeAgent().run();
|
| + this._mainTarget.workerManager.addEventListener(WebInspector.WorkerManager.Events.WorkerDisconnected, onWorkerDisconnected.bind(this));
|
| }
|
|
|
| + /**
|
| + * @this {WebInspector.Main}
|
| + */
|
| function onWorkerDisconnected()
|
| {
|
| var screen = new WebInspector.WorkerTerminatedScreen();
|
| - var listener = hideScreen.bind(null, screen);
|
| - mainTarget.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, listener);
|
| + var listener = hideScreen.bind(this, screen);
|
| + this._mainTarget.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, listener);
|
|
|
| /**
|
| * @param {!WebInspector.WorkerTerminatedScreen} screen
|
| + * @this {WebInspector.Main}
|
| */
|
| function hideScreen(screen)
|
| {
|
| - mainTarget.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, listener);
|
| + this._mainTarget.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, listener);
|
| screen.hide();
|
| }
|
|
|
| @@ -414,7 +417,7 @@ WebInspector.Main.prototype = {
|
| return;
|
| }
|
|
|
| - var request = WebInspector.networkLog.requestForURL(anchor.href);
|
| + var request = WebInspector.NetworkLog.requestForURL(anchor.href);
|
| if (request) {
|
| WebInspector.Revealer.reveal(request);
|
| return;
|
| @@ -553,7 +556,7 @@ WebInspector.Main.prototype = {
|
| */
|
| inspect: function(payload, hints)
|
| {
|
| - var object = WebInspector.runtimeModel.createRemoteObject(payload);
|
| + var object = this._mainTarget.runtimeModel.createRemoteObject(payload);
|
| if (object.isNode()) {
|
| WebInspector.Revealer.revealPromise(object).then(object.release.bind(object));
|
| return;
|
| @@ -598,6 +601,7 @@ WebInspector.Main.prototype = {
|
| targetCrashed: function()
|
| {
|
| (new WebInspector.HelpScreenUntilReload(
|
| + this._mainTarget,
|
| WebInspector.UIString("Inspected target crashed"),
|
| WebInspector.UIString("Inspected target has crashed. Once it reloads we will attach to it automatically."))).showModal();
|
| },
|
|
|