Chromium Code Reviews| 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 054424f577eae930975ea465b7c617f50755cd8d..3aa82a7de74909e5230091c7c2ff2ab72760c526 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)); |
| } |
| @@ -196,14 +190,24 @@ Bindings.NetworkProject = class extends SDK.SDKObject { |
| } |
| /** |
| - * @param {?SDK.ResourceTreeFrame} frame |
| * @param {string} url |
| + * @param {?SDK.ResourceTreeFrame} frame |
| + * @param {boolean} isContentScript |
| + * @return {?Workspace.UISourceCode} |
| */ |
| - _removeFileForURL(frame, url) { |
| - var project = this._workspaceProjects.get(Bindings.NetworkProject.projectId(this.target(), frame, false)); |
| - if (!project) |
| - return; |
| - project.removeFile(url); |
| + getFile(url, frame, isContentScript) { |
|
dgozman
2017/01/27 23:49:12
uiSourceCode(frame, url, isContentScript)
|
| + var project = this._workspaceProject(frame, isContentScript); |
| + return project.uiSourceCodeForURL(url); |
| + } |
| + |
| + /** |
| + * @param {!Workspace.UISourceCode} uiSourceCode |
| + */ |
| + removeFile(uiSourceCode) { |
|
dgozman
2017/01/27 23:49:12
removeUISourceCode
lushnikov
2017/01/30 14:19:15
I was a bit hesitant to add just another one "remo
|
| + var project = uiSourceCode.project(); |
| + console.assert( |
| + project[Bindings.NetworkProject._targetSymbol] === this.target(), 'Cannot remove foreign UISourceCode'); |
| + /** @type {!Bindings.ContentProviderBasedProject} */ (project).removeFile(uiSourceCode.url()); |
| } |
| _populate() { |
| @@ -256,31 +260,16 @@ Bindings.NetworkProject = class extends SDK.SDKObject { |
| } |
| /** |
| - * @param {!Common.Event} event |
| + * @param {!SDK.CSSStyleSheetHeader} header |
| + * @return {!Workspace.UISourceCode} |
| */ |
| - _styleSheetAdded(event) { |
| - var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data); |
| - if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector') |
| - return; |
| - if (!header.resourceURL()) |
| - return; |
| - |
| + createFileForStyleSheetHeader(header) { |
|
dgozman
2017/01/27 23:49:12
Let's get rid of this one as well. We should expos
|
| 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()); |
| + return uiSourceCode; |
| } |
| /** |