[DevTools] Track URL through the target

third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
     }
 
     this._agent = target.pageAgent();
     this._agent.enable();
     this._securityOriginManager = securityOriginManager;
 
     this._fetchResourceTree();
 
     target.registerPageDispatcher(new WebInspector.PageDispatcher(this));
 
-    this._inspectedPageURL = "";
     this._pendingReloadOptions = null;
     this._reloadSuspensionCount = 0;
 
     target.runtimeModel.setExecutionContextComparator(this._executionContextComparator.bind(this));
 }
 
 WebInspector.ResourceTreeModel.EventTypes = {
     FrameAdded: "FrameAdded",
     FrameNavigated: "FrameNavigated",
     FrameDetached: "FrameDetached",
@@ skipping 54 matching lines @@
         /** @type {!Map<string, !WebInspector.ResourceTreeFrame>} */
         this._frames = new Map();
         this._cachedResourcesProcessed = false;
         this._agent.getResourceTree(this._processCachedResources.bind(this));
     },
 
     _processCachedResources: function(error, mainFramePayload)
     {
         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()
     {
         return this._cachedResourcesProcessed;
     },
 
-    _dispatchInspectedURLChanged: function()
-    {
-        InspectorFrontendHost.inspectedURLChanged(this._inspectedPageURL);
-        this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._inspectedPageURL);
-    },
-
     /**
      * @param {!WebInspector.ResourceTreeFrame} frame
      * @param {boolean=} aboutToNavigate
      */
     _addFrame: function(frame, aboutToNavigate)
     {
         this._frames.set(frame.id, frame);
         if (frame.isMainFrame()) {
             this.mainFrame = frame;
             this._securityOriginManager.setMainSecurityOrigin(frame.url);
@@ skipping 62 matching lines @@
             console.assert(frame);
         }
 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, frame);
 
         this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin);
         frame._navigate(framePayload);
         var addedOrigin = frame.securityOrigin;
 
         if (frame.isMainFrame())
-            this._inspectedPageURL = frame.url;
+            this.target().setInspectedURL(frame.url);

[dgozman, 2016/07/27 17:26:06]

Let's do this at the end of the method, so that event is dispatched at the same
time as before.

[eostroukhov-old, 2016/07/27 17:46:58]

Done.

 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, frame);
         if (frame.isMainFrame()) {
             this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, frame);
             if (WebInspector.moduleSetting("preserveConsoleLog").get())
                 WebInspector.console.log(WebInspector.UIString("Navigated to %s", frame.url));
             else
                 this.target().consoleModel.clear();
         }
         if (addedOrigin)
             this._securityOriginManager.addSecurityOrigin(addedOrigin);
 
         // Fill frame with retained resources (the ones loaded using new loader).
         var resources = frame.resources();
         for (var i = 0; i < resources.length; ++i)
             this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, resources[i]);
-
-        if (frame.isMainFrame())
-            this._dispatchInspectedURLChanged();
     },
 
     /**
      * @param {!PageAgent.FrameId} frameId
      */
     _frameDetached: function(frameId)
     {
         // Do nothing unless cached resource tree is processed - it will overwrite everything.
         if (!this._cachedResourcesProcessed)
             return;
@@ skipping 89 matching lines @@
      * @param {?WebInspector.ResourceTreeFrame} parentFrame
      * @param {!PageAgent.FrameResourceTree} frameTreePayload
      */
     _addFramesRecursively: function(parentFrame, frameTreePayload)
     {
         var framePayload = frameTreePayload.frame;
         var frame = new WebInspector.ResourceTreeFrame(this, parentFrame, framePayload.id, framePayload);
         this._addFrame(frame);
 
         var frameResource = this._createResourceFromFramePayload(framePayload, framePayload.url, WebInspector.resourceTypes.Document, framePayload.mimeType);
-        if (frame.isMainFrame())
-            this._inspectedPageURL = frameResource.url;

[dgozman, 2016/07/27 17:26:06]

Where did this go?

[eostroukhov-old, 2016/07/27 17:46:58]

This is ultimately only called from _processCachedResources which sets the url
already.

         frame.addResource(frameResource);
 
         for (var i = 0; frameTreePayload.childFrames && i < frameTreePayload.childFrames.length; ++i)
             this._addFramesRecursively(frame, frameTreePayload.childFrames[i]);
 
         for (var i = 0; i < frameTreePayload.resources.length; ++i) {
             var subresource = frameTreePayload.resources[i];
             var resource = this._createResourceFromFramePayload(framePayload, subresource.url, WebInspector.resourceTypes[subresource.type], subresource.mimeType);
             frame.addResource(resource);
         }
@@ skipping 568 matching lines @@
 
     /**
      * @override
      */
     navigationRequested: function()
     {
        // Frontend is not interested in interstitials.
     }
 
 }