Skip to content

Commit 912f350

Browse files
darwindarwin
committed
squash 'resources/unpacked/devtools' changes from a260a3a..781a13a
781a13a DevTools: more efficiently dispose messages on console clear 3313f07 [DevTools] Migrate usages of Target to RuntimeModel where makes sense ba4c1c8 [Devtools] Make network waterfall draw in layers 7d87606 DevTools: remove SDK.ResourceTreeFrame.fromXXX methods 47f8887 [DevTools] Extract NetworkLog and HAREntry to a separate network_log module 499f535 DevTools: fix release note styles 8381f21 [Devtools] Added ability to add extension columns to network 23171bb DevTools does not show experimental Coverage Panel for Node.js a74eb46 DevTools: [regression] can't disable remote debugging data saver infobar. a42ed73 [DevTools] Make NetworkLog a singleton, and not an SDKModel bf89c2b [DevTools] Fix null pointer in Popover bea3ad8 DevTools: clean up tests to not depend on NetworkProject.addFile method c43e4d4 DevTools: launch What's New from experiments 58f81c8 [DevTools] Move ConsoleModel to it's own module 62df98f DevTools: greyed-out console suggestion should not clash with console history git-subtree-dir: resources/unpacked/devtools git-subtree-split: 781a13a
1 parent caed837 commit 912f350

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1238
-1013
lines changed

‎BUILD.gn

+5-3
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ all_devtools_files = [
134134
"front_end/console/ConsoleViewMessage.js",
135135
"front_end/console/ConsoleViewport.js",
136136
"front_end/console/module.json",
137+
"front_end/console_model/ConsoleModel.js",
138+
"front_end/console_model/module.json",
137139
"front_end/cookie_table/CookiesTable.js",
138140
"front_end/cookie_table/module.json",
139141
"front_end/coverage/coverageListView.css",
@@ -336,6 +338,9 @@ all_devtools_files = [
336338
"front_end/network_conditions/networkConditionsSettingsTab.css",
337339
"front_end/network_group_lookup/module.json",
338340
"front_end/network_group_lookup/NetworkProductGroupLookup.js",
341+
"front_end/network_log/HAREntry.js",
342+
"front_end/network_log/module.json",
343+
"front_end/network_log/NetworkLog.js",
339344
"front_end/object_ui/customPreviewComponent.css",
340345
"front_end/object_ui/CustomPreviewComponent.js",
341346
"front_end/object_ui/JavaScriptAutocomplete.js",
@@ -436,7 +441,6 @@ all_devtools_files = [
436441
"front_end/screencast/screencastView.css",
437442
"front_end/screencast/ScreencastView.js",
438443
"front_end/sdk/Connections.js",
439-
"front_end/sdk/ConsoleModel.js",
440444
"front_end/sdk/ContentProviders.js",
441445
"front_end/sdk/CookieModel.js",
442446
"front_end/sdk/CookieParser.js",
@@ -453,12 +457,10 @@ all_devtools_files = [
453457
"front_end/sdk/DebuggerModel.js",
454458
"front_end/sdk/DOMModel.js",
455459
"front_end/sdk/FilmStripModel.js",
456-
"front_end/sdk/HAREntry.js",
457460
"front_end/sdk/HeapProfilerModel.js",
458461
"front_end/sdk/LayerTreeBase.js",
459462
"front_end/sdk/LogModel.js",
460463
"front_end/sdk/module.json",
461-
"front_end/sdk/NetworkLog.js",
462464
"front_end/sdk/NetworkManager.js",
463465
"front_end/sdk/NetworkRequest.js",
464466
"front_end/sdk/PaintProfiler.js",

‎front_end/Tests.js

+22-18
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
*/
261261
TestSuite.prototype.testScriptsTabIsPopulatedOnInspectedPageRefresh = function() {
262262
var test = this;
263-
var debuggerModel = SDK.DebuggerModel.fromTarget(SDK.targetManager.mainTarget());
263+
var debuggerModel = SDK.targetManager.mainTarget().model(SDK.DebuggerModel);
264264
debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, waitUntilScriptIsParsed);
265265

266266
this.showPanel('elements').then(function() {
@@ -345,7 +345,7 @@
345345
// Tests that debugger works correctly if pause event occurs when DevTools
346346
// frontend is being loaded.
347347
TestSuite.prototype.testPauseWhenLoadingDevTools = function() {
348-
var debuggerModel = SDK.DebuggerModel.fromTarget(SDK.targetManager.mainTarget());
348+
var debuggerModel = SDK.targetManager.mainTarget().model(SDK.DebuggerModel);
349349
if (debuggerModel.debuggerPausedDetails)
350350
return;
351351

@@ -514,19 +514,23 @@
514514
TestSuite.prototype.testConsoleOnNavigateBack = function() {
515515

516516
function filteredMessages() {
517-
return SDK.consoleModel.messages().filter(a => a.source !== SDK.ConsoleMessage.MessageSource.Violation);
517+
return ConsoleModel.consoleModel.messages().filter(
518+
a => a.source !== ConsoleModel.ConsoleMessage.MessageSource.Violation);
518519
}
519520

520-
if (filteredMessages().length === 1)
521+
if (filteredMessages().length === 1) {
521522
firstConsoleMessageReceived.call(this, null);
522-
else
523-
SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
523+
} else {
524+
ConsoleModel.consoleModel.addEventListener(
525+
ConsoleModel.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
526+
}
524527

525528

526529
function firstConsoleMessageReceived(event) {
527-
if (event && event.data.source === SDK.ConsoleMessage.MessageSource.Violation)
530+
if (event && event.data.source === ConsoleModel.ConsoleMessage.MessageSource.Violation)
528531
return;
529-
SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
532+
ConsoleModel.consoleModel.removeEventListener(
533+
ConsoleModel.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
530534
this.evaluateInConsole_('clickLink();', didClickLink.bind(this));
531535
}
532536

@@ -573,8 +577,7 @@
573577
this._waitForTargets(2, callback.bind(this));
574578

575579
function callback() {
576-
var target = SDK.targetManager.targets(SDK.Target.Capability.JS)[0];
577-
var debuggerModel = SDK.DebuggerModel.fromTarget(target);
580+
var debuggerModel = SDK.targetManager.models(SDK.DebuggerModel)[0];
578581
if (debuggerModel.isPaused()) {
579582
this.releaseControl();
580583
return;
@@ -594,7 +597,7 @@
594597
};
595598

596599
TestSuite.prototype.waitForDebuggerPaused = function() {
597-
var debuggerModel = SDK.DebuggerModel.fromTarget(SDK.targetManager.mainTarget());
600+
var debuggerModel = SDK.targetManager.mainTarget().model(SDK.DebuggerModel);
598601
if (debuggerModel.debuggerPausedDetails)
599602
return;
600603

@@ -682,12 +685,13 @@
682685

683686
messages.splice(index, 1);
684687
if (!messages.length) {
685-
SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
688+
ConsoleModel.consoleModel.removeEventListener(
689+
ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
686690
next();
687691
}
688692
}
689693

690-
SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
694+
ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
691695
SDK.multitargetNetworkManager.setNetworkConditions(preset);
692696
}
693697

@@ -832,7 +836,7 @@
832836
};
833837

834838
TestSuite.prototype.testWindowInitializedOnNavigateBack = function() {
835-
var messages = SDK.consoleModel.messages();
839+
var messages = ConsoleModel.consoleModel.messages();
836840
this.assertEquals(1, messages.length);
837841
var text = messages[0].messageText;
838842
if (text.indexOf('Uncaught') !== -1)
@@ -867,7 +871,7 @@
867871
};
868872

869873
TestSuite.prototype.waitForTestResultsInConsole = function() {
870-
var messages = SDK.consoleModel.messages();
874+
var messages = ConsoleModel.consoleModel.messages();
871875
for (var i = 0; i < messages.length; ++i) {
872876
var text = messages[i].messageText;
873877
if (text === 'PASS')
@@ -884,7 +888,7 @@
884888
this.fail(text);
885889
}
886890

887-
SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
891+
ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
888892
this.takeControl();
889893
};
890894

@@ -928,12 +932,12 @@
928932
Array.prototype.slice.call(arguments, 1, -1).map(arg => JSON.stringify(arg)).join(',') + ',';
929933
this.evaluateInConsole_(
930934
`${functionName}(${argsString} function() { console.log('${doneMessage}'); });`, function() {});
931-
SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
935+
ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage);
932936

933937
function onConsoleMessage(event) {
934938
var text = event.data.messageText;
935939
if (text === doneMessage) {
936-
SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
940+
ConsoleModel.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage);
937941
callback();
938942
}
939943
}

‎front_end/audits/AuditController.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ Audits.AuditController = class {
7070
resultCallback(mainResourceURL, results);
7171
}
7272

73-
var networkLog = SDK.NetworkLog.fromTarget(target);
74-
var requests = networkLog ? networkLog.requests().slice() : [];
73+
var requests = NetworkLog.networkLog.requestsForTarget(target).slice();
7574
var compositeProgress = new Common.CompositeProgress(this._progress);
7675
var subprogresses = [];
7776
for (var i = 0; i < categories.length; ++i)

‎front_end/audits/module.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
],
1212
"dependencies": [
1313
"components",
14-
"extensions"
14+
"extensions",
15+
"network_log"
1516
],
1617
"scripts": [
1718
"AuditsPanel.js",

‎front_end/bindings/CompilerScriptMapping.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ Bindings.CompilerScriptMapping = class {
239239

240240
// Report sources.
241241
var missingSources = [];
242+
var executionContext = script.executionContext();
243+
var frameId = executionContext ? executionContext.frameId || '' : '';
242244
for (var sourceURL of sourceMap.sourceURLs()) {
243245
if (this._sourceMapForURL.get(sourceURL))
244246
continue;
@@ -248,8 +250,8 @@ Bindings.CompilerScriptMapping = class {
248250
var contentProvider = sourceMap.sourceContentProvider(sourceURL, Common.resourceTypes.SourceMapScript);
249251
var embeddedContent = sourceMap.embeddedContentByURL(sourceURL);
250252
var embeddedContentLength = typeof embeddedContent === 'string' ? embeddedContent.length : null;
251-
uiSourceCode = this._networkProject.addFile(
252-
contentProvider, SDK.ResourceTreeFrame.fromScript(script), script.isContentScript(), embeddedContentLength);
253+
uiSourceCode = this._networkProject.addSourceMapFile(
254+
contentProvider, frameId, script.isContentScript(), embeddedContentLength);
253255
uiSourceCode[Bindings.CompilerScriptMapping._originSymbol] = script.sourceURL;
254256
}
255257
if (uiSourceCode) {

‎front_end/bindings/DebuggerWorkspaceBinding.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ Bindings.DebuggerWorkspaceBinding = class extends Common.Object {
200200
var target = Bindings.NetworkProject.targetForUISourceCode(uiLocation.uiSourceCode);
201201
if (target) {
202202
var rawLocation = this.uiLocationToRawLocation(
203-
SDK.DebuggerModel.fromTarget(target), uiLocation.uiSourceCode, uiLocation.lineNumber,
204-
uiLocation.columnNumber);
203+
target.model(SDK.DebuggerModel), uiLocation.uiSourceCode, uiLocation.lineNumber, uiLocation.columnNumber);
205204
if (rawLocation)
206205
return this.rawLocationToUILocation(rawLocation);
207206
}

‎front_end/bindings/NetworkProject.js

+32-31
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
8787
resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this));
8888
}
8989

90-
var debuggerModel = SDK.DebuggerModel.fromTarget(target);
90+
var debuggerModel = target.model(SDK.DebuggerModel);
9191
if (debuggerModel) {
9292
this._eventListeners.push(
9393
debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this),
@@ -106,12 +106,12 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
106106

107107
/**
108108
* @param {!SDK.Target} target
109-
* @param {?SDK.ResourceTreeFrame} frame
109+
* @param {string} frameId
110110
* @param {boolean} isContentScripts
111111
* @return {string}
112112
*/
113-
static projectId(target, frame, isContentScripts) {
114-
return target.id() + ':' + (frame ? frame.id : '') + ':' + (isContentScripts ? 'contentscripts' : '');
113+
static projectId(target, frameId, isContentScripts) {
114+
return target.id() + ':' + frameId + ':' + (isContentScripts ? 'contentscripts' : '');
115115
}
116116

117117
/**
@@ -162,12 +162,12 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
162162
}
163163

164164
/**
165-
* @param {?SDK.ResourceTreeFrame} frame
165+
* @param {string} frameId
166166
* @param {boolean} isContentScripts
167167
* @return {!Bindings.ContentProviderBasedProject}
168168
*/
169-
_workspaceProject(frame, isContentScripts) {
170-
var projectId = Bindings.NetworkProject.projectId(this.target(), frame, isContentScripts);
169+
_workspaceProject(frameId, isContentScripts) {
170+
var projectId = Bindings.NetworkProject.projectId(this.target(), frameId, isContentScripts);
171171
var projectType = isContentScripts ? Workspace.projectTypes.ContentScripts : Workspace.projectTypes.Network;
172172

173173
var project = this._workspaceProjects.get(projectId);
@@ -177,31 +177,32 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
177177
project = new Bindings.ContentProviderBasedProject(
178178
this._workspace, projectId, projectType, '', false /* isServiceProject */);
179179
project[Bindings.NetworkProject._targetSymbol] = this.target();
180-
project[Bindings.NetworkProject._frameSymbol] = frame;
180+
project[Bindings.NetworkProject._frameSymbol] =
181+
frameId && this._resourceTreeModel ? this._resourceTreeModel.frameForId(frameId) : null;
181182
this._workspaceProjects.set(projectId, project);
182183
return project;
183184
}
184185

185186
/**
186187
* @param {!Common.ContentProvider} contentProvider
187-
* @param {?SDK.ResourceTreeFrame} frame
188+
* @param {string} frameId
188189
* @param {boolean} isContentScript
189190
* @param {?number} contentSize
190191
* @return {!Workspace.UISourceCode}
191192
*/
192-
addFile(contentProvider, frame, isContentScript, contentSize) {
193-
var uiSourceCode = this._createFile(contentProvider, frame, isContentScript || false);
193+
addSourceMapFile(contentProvider, frameId, isContentScript, contentSize) {
194+
var uiSourceCode = this._createFile(contentProvider, frameId, isContentScript || false);
194195
var metadata = typeof contentSize === 'number' ? new Workspace.UISourceCodeMetadata(null, contentSize) : null;
195196
this._addUISourceCodeWithProvider(uiSourceCode, contentProvider, metadata);
196197
return uiSourceCode;
197198
}
198199

199200
/**
200-
* @param {?SDK.ResourceTreeFrame} frame
201+
* @param {string} frameId
201202
* @param {string} url
202203
*/
203-
_removeFileForURL(frame, url) {
204-
var project = this._workspaceProjects.get(Bindings.NetworkProject.projectId(this.target(), frame, false));
204+
_removeFileForURL(frameId, url) {
205+
var project = this._workspaceProjects.get(Bindings.NetworkProject.projectId(this.target(), frameId, false));
205206
if (!project)
206207
return;
207208
project.removeFile(url);
@@ -251,8 +252,9 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
251252
return;
252253
}
253254
var originalContentProvider = script.originalContentProvider();
254-
var uiSourceCode =
255-
this._createFile(originalContentProvider, SDK.ResourceTreeFrame.fromScript(script), script.isContentScript());
255+
var executionContext = script.executionContext();
256+
var frameId = executionContext ? executionContext.frameId || '' : '';
257+
var uiSourceCode = this._createFile(originalContentProvider, frameId, script.isContentScript());
256258
uiSourceCode[Bindings.NetworkProject._scriptSymbol] = script;
257259
var resource = SDK.ResourceTreeModel.resourceForURL(uiSourceCode.url());
258260
this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, this._resourceMetadata(resource));
@@ -269,7 +271,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
269271
return;
270272

271273
var originalContentProvider = header.originalContentProvider();
272-
var uiSourceCode = this._createFile(originalContentProvider, SDK.ResourceTreeFrame.fromStyleSheet(header), false);
274+
var uiSourceCode = this._createFile(originalContentProvider, header.frameId, false);
273275
uiSourceCode[Bindings.NetworkProject._styleSheetSymbol] = header;
274276
var resource = SDK.ResourceTreeModel.resourceForURL(uiSourceCode.url());
275277
this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, this._resourceMetadata(resource));
@@ -283,7 +285,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
283285
if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
284286
return;
285287

286-
this._removeFileForURL(SDK.ResourceTreeFrame.fromStyleSheet(header), header.resourceURL());
288+
this._removeFileForURL(header.frameId, header.resourceURL());
287289
}
288290

289291
/**
@@ -314,14 +316,13 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
314316
resource.contentURL().startsWith('data:'))
315317
return;
316318

317-
var frame = SDK.ResourceTreeFrame.fromResource(resource);
318319
// Never load document twice.
319-
var projectId = Bindings.NetworkProject.projectId(this.target(), frame, false);
320+
var projectId = Bindings.NetworkProject.projectId(this.target(), resource.frameId, false);
320321
var project = this._workspaceProjects.get(projectId);
321322
if (project && project.uiSourceCodeForURL(resource.url))
322323
return;
323324

324-
var uiSourceCode = this._createFile(resource, frame, false);
325+
var uiSourceCode = this._createFile(resource, resource.frameId, false);
325326
uiSourceCode[Bindings.NetworkProject._resourceSymbol] = resource;
326327
this._addUISourceCodeWithProvider(uiSourceCode, resource, this._resourceMetadata(resource));
327328
}
@@ -330,10 +331,10 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
330331
* @param {!SDK.ResourceTreeFrame} frame
331332
*/
332333
_removeFrameResources(frame) {
333-
var project = this._workspaceProject(frame, false);
334+
var project = this._workspaceProject(frame.id, false);
334335
for (var resource of frame.resources())
335336
project.removeUISourceCode(resource.url);
336-
project = this._workspaceProject(frame, true);
337+
project = this._workspaceProject(frame.id, true);
337338
for (var resource of frame.resources())
338339
project.removeUISourceCode(resource.url);
339340
}
@@ -370,13 +371,13 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
370371

371372
/**
372373
* @param {!Common.ContentProvider} contentProvider
373-
* @param {?SDK.ResourceTreeFrame} frame
374+
* @param {string} frameId
374375
* @param {boolean} isContentScript
375376
* @return {!Workspace.UISourceCode}
376377
*/
377-
_createFile(contentProvider, frame, isContentScript) {
378+
_createFile(contentProvider, frameId, isContentScript) {
378379
var url = contentProvider.contentURL();
379-
var project = this._workspaceProject(frame, isContentScript);
380+
var project = this._workspaceProject(frameId, isContentScript);
380381
var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
381382
uiSourceCode[Bindings.NetworkProject._targetSymbol] = this.target();
382383
return uiSourceCode;
@@ -412,9 +413,10 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
412413
*/
413414
static uiSourceCodeForScriptURL(workspace, url, script) {
414415
var target = script.debuggerModel.target();
415-
var frame = SDK.ResourceTreeFrame.fromScript(script);
416-
return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frame, false), url) ||
417-
workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frame, true), url);
416+
var executionContext = script.executionContext();
417+
var frameId = executionContext ? executionContext.frameId || '' : '';
418+
return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, false), url) ||
419+
workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, true), url);
418420
}
419421

420422
/**
@@ -424,8 +426,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
424426
* @return {?Workspace.UISourceCode}
425427
*/
426428
static uiSourceCodeForStyleURL(workspace, url, header) {
427-
var frame = SDK.ResourceTreeFrame.fromStyleSheet(header);
428-
return workspace.uiSourceCode(Bindings.NetworkProject.projectId(header.target(), frame, false), url);
429+
return workspace.uiSourceCode(Bindings.NetworkProject.projectId(header.target(), header.frameId, false), url);
429430
}
430431
};
431432

0 commit comments

Comments
 (0)