Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Side by Side Diff: Source/devtools/front_end/inspector.js

Issue 201123007: DevTools: Create target per each worker behind experiment (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address vsevik's comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). 3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 return; 181 return;
182 } 182 }
183 183
184 InspectorBackend.loadFromJSONIfNeeded("../protocol.json"); 184 InspectorBackend.loadFromJSONIfNeeded("../protocol.json");
185 WebInspector.dockController = new WebInspector.DockController(!!WebInspe ctor.queryParam("can_dock")); 185 WebInspector.dockController = new WebInspector.DockController(!!WebInspe ctor.queryParam("can_dock"));
186 186
187 var onConnectionReady = this._doLoadedDone.bind(this); 187 var onConnectionReady = this._doLoadedDone.bind(this);
188 188
189 var workerId = WebInspector.queryParam("dedicatedWorkerId"); 189 var workerId = WebInspector.queryParam("dedicatedWorkerId");
190 if (workerId) { 190 if (workerId) {
191 new WebInspector.WorkerConnection(workerId, onConnectionReady); 191 new WebInspector.ExternalWorkerConnection(workerId, onConnectionRead y);
192 return; 192 return;
193 } 193 }
194 194
195 var ws; 195 var ws;
196 if (WebInspector.queryParam("ws")) { 196 if (WebInspector.queryParam("ws")) {
197 ws = "ws://" + WebInspector.queryParam("ws"); 197 ws = "ws://" + WebInspector.queryParam("ws");
198 } else if (WebInspector.queryParam("page")) { 198 } else if (WebInspector.queryParam("page")) {
199 var page = WebInspector.queryParam("page"); 199 var page = WebInspector.queryParam("page");
200 var host = WebInspector.queryParam("host") || window.location.host; 200 var host = WebInspector.queryParam("host") || window.location.host;
201 ws = "ws://" + host + "/devtools/page/" + page; 201 ws = "ws://" + host + "/devtools/page/" + page;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 this._updateErrorAndWarningCounts(); 344 this._updateErrorAndWarningCounts();
345 345
346 WebInspector.extensionServerProxy.setFrontendReady(); 346 WebInspector.extensionServerProxy.setFrontendReady();
347 347
348 WebInspector.console.enableAgent(); 348 WebInspector.console.enableAgent();
349 349
350 WebInspector.databaseModel = new WebInspector.DatabaseModel(); 350 WebInspector.databaseModel = new WebInspector.DatabaseModel();
351 WebInspector.domStorageModel = new WebInspector.DOMStorageModel(); 351 WebInspector.domStorageModel = new WebInspector.DOMStorageModel();
352 WebInspector.cpuProfilerModel = new WebInspector.CPUProfilerModel(); 352 WebInspector.cpuProfilerModel = new WebInspector.CPUProfilerModel();
353 353
354 if (WebInspector.experimentsSettings.workersInMainWindow.isEnabled())
vsevik 2014/03/19 16:33:39 Let's move this to the beginning of the method.
sergeyv 2014/03/19 16:43:50 Done.
355 new WebInspector.WorkerTargetManager(mainTarget, WebInspector.target Manager);
356
354 InspectorAgent.enable(inspectorAgentEnableCallback.bind(this)); 357 InspectorAgent.enable(inspectorAgentEnableCallback.bind(this));
355 358
356 /** 359 /**
357 * @this {WebInspector.Main} 360 * @this {WebInspector.Main}
358 */ 361 */
359 function inspectorAgentEnableCallback() 362 function inspectorAgentEnableCallback()
360 { 363 {
361 WebInspector.inspectorView.showInitialPanel(); 364 WebInspector.inspectorView.showInitialPanel();
362 365
363 if (WebInspector.overridesSupport.hasActiveOverrides()) { 366 if (WebInspector.overridesSupport.hasActiveOverrides()) {
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 711
709 WebInspector.reload = function() 712 WebInspector.reload = function()
710 { 713 {
711 InspectorAgent.reset(); 714 InspectorAgent.reset();
712 window.location.reload(); 715 window.location.reload();
713 } 716 }
714 717
715 new WebInspector.Main(); 718 new WebInspector.Main();
716 719
717 window.DEBUG = true; 720 window.DEBUG = true;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698