[DevTools] Pass the frame payload

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 111 matching lines @@
   isInterstitialShowing() {
     return this._isInterstitialShowing;
   }
 
   /**
    * @param {!SDK.ResourceTreeFrame} frame
    * @param {boolean=} aboutToNavigate
    */
   _addFrame(frame, aboutToNavigate) {
     this._frames.set(frame.id, frame);
-    if (frame.isMainFrame()) {
+    if (frame.isMainFrame())
       this.mainFrame = frame;
-      this._securityOriginManager.setMainSecurityOrigin(frame.url);
-    }
     this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameAdded, frame);
     if (!aboutToNavigate)
-      this._securityOriginManager.addSecurityOrigin(frame.securityOrigin);
+      this._updateSecurityOrigins();

[pfeldman, 2017/01/09 20:06:13]

You should unconditionally update origins.

[eostroukhov, 2017/01/09 20:32:01]

Done.

   }
 
   /**
-   * @param {!SDK.ResourceTreeFrame} mainFrame
-   */
-  _handleMainFrameDetached(mainFrame) {
-    /**
-     * @param {!SDK.ResourceTreeFrame} frame
-     * @this {SDK.ResourceTreeModel}
-     */
-    function removeOriginForFrame(frame) {
-      for (var i = 0; i < frame.childFrames.length; ++i)
-        removeOriginForFrame.call(this, frame.childFrames[i]);
-      if (!frame.isMainFrame())
-        this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin);
-    }
-    removeOriginForFrame.call(this, mainFrame);
-  }
-
-  /**
    * @param {!Protocol.Page.FrameId} frameId
    * @param {?Protocol.Page.FrameId} parentFrameId
    * @return {?SDK.ResourceTreeFrame}
    */
   _frameAttached(frameId, parentFrameId) {
     // Do nothing unless cached resource tree is processed - it will overwrite everything.
     if (!this._cachedResourcesProcessed && parentFrameId)
       return null;
     if (this._frames.has(frameId))
       return null;
 
     var parentFrame = parentFrameId ? (this._frames.get(parentFrameId) || null) : null;
     var frame = new SDK.ResourceTreeFrame(this, parentFrame, frameId);
     if (frame.isMainFrame() && this.mainFrame) {
-      this._handleMainFrameDetached(this.mainFrame);
       // Navigation to the new backend process.
       this._frameDetached(this.mainFrame.id);
     }
     this._addFrame(frame, true);
     return frame;
   }
 
   /**
    * @param {!Protocol.Page.Frame} framePayload
    */
   _frameNavigated(framePayload) {
     // Do nothing unless cached resource tree is processed - it will overwrite everything.
     if (!this._cachedResourcesProcessed && framePayload.parentId)
       return;
     var frame = this._frames.get(framePayload.id);
     if (!frame) {
       // Simulate missed "frameAttached" for a main frame navigation to the new backend process.
       console.assert(!framePayload.parentId, 'Main frame shouldn\'t have parent frame id.');
       frame = this._frameAttached(framePayload.id, framePayload.parentId || '');
       console.assert(frame);
     }
 
     this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameWillNavigate, frame);
+    frame._navigate(framePayload);
+    this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameNavigated, frame);
 
-    this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin);
-    frame._navigate(framePayload);
-    var addedOrigin = frame.securityOrigin;
-
-    this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameNavigated, frame);
     if (frame.isMainFrame()) {
       this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.MainFrameNavigated, frame);
       if (Common.moduleSetting('preserveConsoleLog').get())
         Common.console.log(Common.UIString('Navigated to %s', frame.url));
     }
-    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(SDK.ResourceTreeModel.Events.ResourceAdded, resources[i]);
 
     if (frame.isMainFrame())
       this.target().setInspectedURL(frame.url);
+    this._updateSecurityOrigins();
   }
 
   /**
    * @param {!Protocol.Page.FrameId} frameId
    */
   _frameDetached(frameId) {
     // Do nothing unless cached resource tree is processed - it will overwrite everything.
     if (!this._cachedResourcesProcessed)
       return;
 
     var frame = this._frames.get(frameId);
     if (!frame)
       return;
 
-    this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin);
     if (frame.parentFrame)
       frame.parentFrame._removeChildFrame(frame);
     else
       frame._remove();

[pfeldman, 2017/01/09 20:06:13]

You should update origins here as well.

   }
 
   /**
    * @param {!Protocol.Page.FrameId} frameId
    */
   _frameStartedLoading(frameId) {
     // Do nothing unless cached resource tree is processed - it will overwrite everything.
     if (!this._cachedResourcesProcessed)
       return;
 
@@ skipping 197 matching lines @@
       return -1;
 
     if (!frameB && frameA)
       return 1;
 
     if (frameA && frameB)
       return frameA.id.localeCompare(frameB.id);
 
     return SDK.ExecutionContext.comparator(a, b);
   }
+
+  _updateSecurityOrigins() {
+    var securityOrigins = [];

[pfeldman, 2017/01/09 20:06:13]

You should use Set here, otherwise you report same origin as added multiple
times.

[eostroukhov, 2017/01/09 20:32:01]

Done.

+    var mainSecurityOrigin = null;
+    for (var frame of this._frames.values()) {
+      var origin = frame.securityOrigin;
+      if (!origin)
+        continue;
+      securityOrigins.push(origin);
+      if (frame.isMainFrame())
+        mainSecurityOrigin = origin;
+    }
+    this._securityOriginManager.updateSecurityOrigins(securityOrigins);
+    this._securityOriginManager.setMainSecurityOrigin(mainSecurityOrigin || '');
+  }
 };
 
 /** @enum {symbol} */
 SDK.ResourceTreeModel.Events = {
   FrameAdded: Symbol('FrameAdded'),
   FrameNavigated: Symbol('FrameNavigated'),
   FrameDetached: Symbol('FrameDetached'),
   FrameResized: Symbol('FrameResized'),
   FrameWillNavigate: Symbol('FrameWillNavigate'),
   MainFrameNavigated: Symbol('MainFrameNavigated'),
@@ skipping 187 matching lines @@
   _removeChildFrames() {
     var frames = this._childFrames;
     this._childFrames = [];
     for (var i = 0; i < frames.length; ++i)
       frames[i]._remove();
   }
 
   _remove() {
     this._removeChildFrames();
     this._model._frames.delete(this.id);
+    this._model._updateSecurityOrigins();

[pfeldman, 2017/01/09 20:06:13]

You are calling this in a loop, I'd rather intercept higher level calls.

[eostroukhov, 2017/01/09 20:32:01]

Done.

     this._model.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameDetached, this);
   }
 
   /**
    * @param {!SDK.Resource} resource
    */
   addResource(resource) {
     if (this._resourcesMap[resource.url] === resource) {
       // Already in the tree, we just got an extra update.
       return;
@@ skipping 222 matching lines @@
     this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Events.InterstitialHidden);
   }
 
   /**
    * @override
    */
   navigationRequested() {
     // Frontend is not interested in when navigations are requested.
   }
 };