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

Unified Diff: third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js

Issue 2893523002: DevTools: make StyleSourceMapping in charge of managing UISourceCodes (Closed)
Patch Set: address comments Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
index 4f3b51f9ce1afbd4cf8148cb08dfee0987378a74..cac03cf1cb3433759881431e237df0d1c9d51464 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
@@ -47,7 +47,7 @@ Bindings.NetworkProjectManager = class extends Common.Object {
* @param {!SDK.Target} target
*/
targetAdded(target) {
- new Bindings.NetworkProject(target, this._workspace, target.model(SDK.ResourceTreeModel));
+ new Bindings.NetworkProject(target, this._workspace);
}
/**
@@ -71,14 +71,12 @@ Bindings.NetworkProject = class {
/**
* @param {!SDK.Target} target
* @param {!Workspace.Workspace} workspace
- * @param {?SDK.ResourceTreeModel} resourceTreeModel
*/
- constructor(target, workspace, resourceTreeModel) {
+ constructor(target, workspace) {
this._target = target;
this._workspace = workspace;
/** @type {!Map<string, !Bindings.ContentProviderBasedProject>} */
this._workspaceProjects = new Map();
- this._resourceTreeModel = resourceTreeModel;
target[Bindings.NetworkProject._networkProjectSymbol] = this;
this._eventListeners = [];
@@ -98,12 +96,6 @@ Bindings.NetworkProject = class {
this._debuggerModel.addEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this));
}
- var cssModel = target.model(SDK.CSSModel);
- if (cssModel) {
- this._eventListeners.push(
- cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
- cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this));
- }
}
/**
@@ -286,7 +278,7 @@ Bindings.NetworkProject = class {
var frameId = Bindings.frameIdForScript(script);
script[Bindings.NetworkProject._frameIdSymbol] = frameId;
var uiSourceCode = this._createFile(originalContentProvider, frameId, script.isContentScript());
- var metadata = this._fetchMetadata(frameId, uiSourceCode.url());
+ var metadata = Bindings.metadataForURL(this._target, frameId, uiSourceCode.url());
this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, metadata, 'text/javascript');
}
@@ -319,42 +311,6 @@ Bindings.NetworkProject = class {
this._removeScripts(Array.from(this._acceptedScripts));
}
- /**
- * @param {!SDK.CSSStyleSheetHeader} header
- */
- _acceptsHeader(header) {
- if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
- return false;
- if (!header.resourceURL())
- return false;
- return true;
- }
-
- /**
- * @param {!Common.Event} event
- */
- _styleSheetAdded(event) {
- var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
- if (!this._acceptsHeader(header))
- return;
-
- var originalContentProvider = header.originalContentProvider();
- var uiSourceCode = this._createFile(originalContentProvider, header.frameId, false);
- uiSourceCode[Bindings.NetworkProject._styleSheetSymbol] = header;
- var metadata = this._fetchMetadata(header.frameId, uiSourceCode.url());
- this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, metadata, 'text/css');
- }
-
- /**
- * @param {!Common.Event} event
- */
- _styleSheetRemoved(event) {
- var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
- if (!this._acceptsHeader(header))
- return;
- this._removeFileForURL(header.resourceURL(), header.frameId, false);
- }
-
/**
* @param {!Common.ContentProvider} contentProvider
* @param {string} frameId
@@ -370,20 +326,6 @@ Bindings.NetworkProject = class {
return uiSourceCode;
}
- /**
- * @param {string} frameId
- * @param {string} url
- * @return {?Workspace.UISourceCodeMetadata}
- */
- _fetchMetadata(frameId, url) {
- if (!this._resourceTreeModel)
- return null;
- var frame = this._resourceTreeModel.frameForId(frameId);
- if (!frame)
- return null;
- return Bindings.resourceMetadata(frame.resourceForURL(url));
- }
-
_dispose() {
for (var project of this._workspaceProjects.values())
project.removeProject();
@@ -411,30 +353,10 @@ Bindings.NetworkProject = class {
return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, false), url) ||
workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, true), url);
}
-
- /**
- * @param {!Workspace.Workspace} workspace
- * @param {string} url
- * @param {!SDK.CSSStyleSheetHeader} header
- * @return {?Workspace.UISourceCode}
- */
- static uiSourceCodeForStyleURL(workspace, url, header) {
- return workspace.uiSourceCode(
- Bindings.NetworkProject.projectId(header.cssModel().target(), header.frameId, false), url);
- }
-
- /**
- * @param {!Workspace.UISourceCode} uiSourceCode
- * @return {?SDK.CSSStyleSheetHeader}
- */
- static styleHeaderForUISourceCode(uiSourceCode) {
- return uiSourceCode[Bindings.NetworkProject._styleSheetSymbol];
- }
};
Bindings.NetworkProject._networkProjectSymbol = Symbol('networkProject');
-Bindings.NetworkProject._styleSheetSymbol = Symbol('styleSheet');
Bindings.NetworkProject._targetSymbol = Symbol('target');
Bindings.NetworkProject._frameIdSymbol = Symbol('frameid');
-Bindings.NetworkProject._frameAttributionSymbol = Symbol('Bindings.NetworkProject._frameAttributionSymbol');
+Bindings.NetworkProject._frameAttributionSymbol = Symbol('Bindings.NetworkProject._frameAttributionSymbol');

Powered by Google App Engine
This is Rietveld 408576698