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

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

Issue 2662513003: DevTools: make StylesSourceMapping in charge of creating and removing UISourceCodes (Closed)
Patch Set: move projects under stylessourcemapping Created 3 years, 10 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 54e72ff22113c34975c35f4713a3e7201e2e80af..628fd1801a8abebf1ec22c73a8c3f1f0b56b8d32 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
@@ -93,12 +93,6 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
debuggerModel.addEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this));
}
- var cssModel = SDK.CSSModel.fromTarget(target);
- if (cssModel) {
- this._eventListeners.push(
- cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
- cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this));
- }
this._eventListeners.push(target.targetManager().addEventListener(
SDK.TargetManager.Events.SuspendStateChanged, this._suspendStateChanged, this));
}
@@ -142,7 +136,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
* @return {?SDK.Target} target
*/
static targetForUISourceCode(uiSourceCode) {
- return uiSourceCode[Bindings.NetworkProject._targetSymbol] || null;
+ return uiSourceCode.project()[Bindings.NetworkProject._targetSymbol] || null;
}
/**
@@ -150,7 +144,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
* @return {string}
*/
static uiSourceCodeMimeType(uiSourceCode) {
- if (uiSourceCode[Bindings.NetworkProject._scriptSymbol] || uiSourceCode[Bindings.NetworkProject._styleSheetSymbol])
+ if (uiSourceCode[Bindings.NetworkProject._useExplicitMimeType])
return uiSourceCode.contentType().canonicalMimeType();
var resource = uiSourceCode[Bindings.NetworkProject._resourceSymbol];
@@ -182,6 +176,23 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
}
/**
+ * @param {!Workspace.Project} project
+ * @param {!SDK.Target} target
+ * @param {?SDK.ResourceTreeFrame} frame
+ */
+ static annotateProjectWithTargetAndFrame(project, target, frame) {
+ project[Bindings.NetworkProject._targetSymbol] = target;
+ project[Bindings.NetworkProject._frameSymbol] = frame;
+ }
+
+ /**
+ * @param {!Workspace.UISourceCode} uiSourceCode
+ */
+ static useExplicitMimeType(uiSourceCode) {
+ uiSourceCode[Bindings.NetworkProject._useExplicitMimeType] = true;
+ }
+
+ /**
* @param {!Common.ContentProvider} contentProvider
* @param {?SDK.ResourceTreeFrame} frame
* @param {boolean} isContentScript
@@ -195,17 +206,6 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
return uiSourceCode;
}
- /**
- * @param {?SDK.ResourceTreeFrame} frame
- * @param {string} url
- */
- _removeFileForURL(frame, url) {
- var project = this._workspaceProjects.get(Bindings.NetworkProject.projectId(this.target(), frame, false));
- if (!project)
- return;
- project.removeFile(url);
- }
-
_populate() {
/**
* @param {!SDK.ResourceTreeFrame} frame
@@ -250,37 +250,9 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
return;
}
var uiSourceCode = this._createFile(script, SDK.ResourceTreeFrame.fromScript(script), script.isContentScript());
- uiSourceCode[Bindings.NetworkProject._scriptSymbol] = script;
+ uiSourceCode[Bindings.NetworkProject._useExplicitMimeType] = true;
var resource = SDK.ResourceTreeModel.resourceForURL(uiSourceCode.url());
- this._addUISourceCodeWithProvider(uiSourceCode, script, this._resourceMetadata(resource));
- }
-
- /**
- * @param {!Common.Event} event
- */
- _styleSheetAdded(event) {
- var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
- if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
- return;
- if (!header.resourceURL())
- return;
-
- var originalContentProvider = header.originalContentProvider();
- var uiSourceCode = this._createFile(originalContentProvider, SDK.ResourceTreeFrame.fromStyleSheet(header), false);
- uiSourceCode[Bindings.NetworkProject._styleSheetSymbol] = header;
- var resource = SDK.ResourceTreeModel.resourceForURL(uiSourceCode.url());
- this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, this._resourceMetadata(resource));
- }
-
- /**
- * @param {!Common.Event} event
- */
- _styleSheetRemoved(event) {
- var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
- if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
- return;
-
- this._removeFileForURL(SDK.ResourceTreeFrame.fromStyleSheet(header), header.resourceURL());
+ this._addUISourceCodeWithProvider(uiSourceCode, script, Bindings.NetworkProject.resourceMetadata(resource));
}
/**
@@ -317,7 +289,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
var uiSourceCode = this._createFile(resource, SDK.ResourceTreeFrame.fromResource(resource), false);
uiSourceCode[Bindings.NetworkProject._resourceSymbol] = resource;
- this._addUISourceCodeWithProvider(uiSourceCode, resource, this._resourceMetadata(resource));
+ this._addUISourceCodeWithProvider(uiSourceCode, resource, Bindings.NetworkProject.resourceMetadata(resource));
}
/**
@@ -358,7 +330,6 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
var url = contentProvider.contentURL();
var project = this._workspaceProject(frame, isContentScript);
var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
- uiSourceCode[Bindings.NetworkProject._targetSymbol] = this.target();
return uiSourceCode;
}
@@ -366,7 +337,7 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
* @param {?SDK.Resource} resource
* @return {?Workspace.UISourceCodeMetadata}
*/
- _resourceMetadata(resource) {
+ static resourceMetadata(resource) {
if (!resource || (typeof resource.contentSize() !== 'number' && !resource.lastModified()))
return null;
return new Workspace.UISourceCodeMetadata(resource.lastModified(), resource.contentSize());
@@ -411,7 +382,6 @@ Bindings.NetworkProject = class extends SDK.SDKObject {
Bindings.NetworkProject._networkProjectSymbol = Symbol('networkProject');
Bindings.NetworkProject._resourceSymbol = Symbol('resource');
-Bindings.NetworkProject._scriptSymbol = Symbol('script');
-Bindings.NetworkProject._styleSheetSymbol = Symbol('styleSheet');
+Bindings.NetworkProject._useExplicitMimeType = Symbol('useExplicitMimeType');
Bindings.NetworkProject._targetSymbol = Symbol('target');
Bindings.NetworkProject._frameSymbol = Symbol('frame');

Powered by Google App Engine
This is Rietveld 408576698