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

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js

Issue 2186753002: [DevTools] Track URL through the target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed Created 4 years, 5 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/sdk/ResourceTreeModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
index d70ad805d030110f17e108ddd7e7509b521c45af..8848923762a332acb263a21aec9c31cc5ad420c4 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
@@ -53,7 +53,6 @@ WebInspector.ResourceTreeModel = function(target, networkManager, securityOrigin
target.registerPageDispatcher(new WebInspector.PageDispatcher(this));
- this._inspectedPageURL = "";
this._pendingReloadOptions = null;
this._reloadSuspensionCount = 0;
@@ -74,7 +73,6 @@ WebInspector.ResourceTreeModel.EventTypes = {
Load: "Load",
PageReloadRequested: "PageReloadRequested",
WillReloadPage: "WillReloadPage",
- InspectedURLChanged: "InspectedURLChanged",
ScreencastFrame: "ScreencastFrame",
ScreencastVisibilityChanged: "ScreencastVisibilityChanged",
ColorPicked: "ColorPicked"
@@ -128,32 +126,14 @@ WebInspector.ResourceTreeModel.prototype = {
{
if (!error) {
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources);
- this._inspectedPageURL = mainFramePayload.frame.url;
this._addFramesRecursively(null, mainFramePayload);
- this._dispatchInspectedURLChanged();
+ this.target().setInspectedURL(mainFramePayload.frame.url);
}
this._cachedResourcesProcessed = true;
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);
},
/**
- * @return {string}
- */
- inspectedPageURL: function()
- {
- return this._inspectedPageURL;
- },
-
- /**
- * @return {string}
- */
- inspectedPageDomain: function()
- {
- var parsedURL = this._inspectedPageURL ? this._inspectedPageURL.asParsedURL() : null;
- return parsedURL ? parsedURL.host : "";
- },
-
- /**
* @return {boolean}
*/
cachedResourcesLoaded: function()
@@ -161,12 +141,6 @@ WebInspector.ResourceTreeModel.prototype = {
return this._cachedResourcesProcessed;
},
- _dispatchInspectedURLChanged: function()
- {
- InspectorFrontendHost.inspectedURLChanged(this._inspectedPageURL);
- this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._inspectedPageURL);
- },
-
/**
* @param {!WebInspector.ResourceTreeFrame} frame
* @param {boolean=} aboutToNavigate
@@ -248,9 +222,6 @@ WebInspector.ResourceTreeModel.prototype = {
frame._navigate(framePayload);
var addedOrigin = frame.securityOrigin;
- if (frame.isMainFrame())
- this._inspectedPageURL = frame.url;
-
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, frame);
if (frame.isMainFrame()) {
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, frame);
@@ -268,7 +239,7 @@ WebInspector.ResourceTreeModel.prototype = {
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, resources[i]);
if (frame.isMainFrame())
- this._dispatchInspectedURLChanged();
+ this.target().setInspectedURL(frame.url);
},
/**
@@ -378,8 +349,6 @@ WebInspector.ResourceTreeModel.prototype = {
this._addFrame(frame);
var frameResource = this._createResourceFromFramePayload(framePayload, framePayload.url, WebInspector.resourceTypes.Document, framePayload.mimeType);
- if (frame.isMainFrame())
- this._inspectedPageURL = frameResource.url;
frame.addResource(frameResource);
for (var i = 0; frameTreePayload.childFrames && i < frameTreePayload.childFrames.length; ++i)

Powered by Google App Engine
This is Rietveld 408576698