DevTools: Fix getCookies to report for all resources

third_party/WebKit/Source/devtools/front_end/resources/CookieItemsView.js

 /*
  * Copyright (C) 2009 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 13 matching lines @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @unrestricted
  */
 Resources.CookieItemsView = class extends UI.SimpleView {
-  constructor(treeElement, cookieDomain) {
+  constructor(treeElement, target, cookieDomain) {
     super(Common.UIString('Cookies'));
 
     this.element.classList.add('storage-view');
 
     this._deleteButton = new UI.ToolbarButton(Common.UIString('Delete Selected'), 'largeicon-delete');
     this._deleteButton.addEventListener(UI.ToolbarButton.Events.Click, this._deleteButtonClicked, this);
 
     this._clearButton = new UI.ToolbarButton(Common.UIString('Clear All'), 'largeicon-clear');
     this._clearButton.addEventListener(UI.ToolbarButton.Events.Click, this._clearButtonClicked, this);
 
     this._refreshButton = new UI.ToolbarButton(Common.UIString('Refresh'), 'largeicon-refresh');
     this._refreshButton.addEventListener(UI.ToolbarButton.Events.Click, this._refreshButtonClicked, this);
 
     this._filterBar = new UI.FilterBar('cookiesPanel', true);
     this._textFilterUI = new UI.TextFilterUI(true);
     this._textFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this._filterChanged, this);
     this._filterBar.addFilter(this._textFilterUI);
 
     this._filterSeparator = new UI.ToolbarSeparator();
     this._filterButton = this._filterBar.filterButton();
 
+    this._target = target;
     this._treeElement = treeElement;
     this._cookieDomain = cookieDomain;
 
     this._emptyWidget = new UI.EmptyWidget(
         cookieDomain ?
             Common.UIString('This site has no cookies.') :
             Common.UIString(
                 'By default cookies are disabled for local files.\nYou could override this by starting the browser with --enable-file-cookies command line flag.'));
     this._emptyWidget.show(this.element);
 
@@ skipping 25 matching lines @@
   /**
    * @param {!Common.Event} event
    */
   _filterChanged(event) {
     var text = this._textFilterUI.value();
     this._filterRegex = text && new RegExp(text.escapeForRegExp(), 'i');
     this._update();
   }
 
   _update() {
-    SDK.Cookies.getCookiesAsync(this._updateWithCookies.bind(this));
+    var resourceURLs = [];
+    var cookieDomain = this._cookieDomain;
+    function populateResourceURLs(resource) {

[pfeldman, 2017/01/13 02:17:34]

You should annotate all function parameters for compilation.

[phulce, 2017/01/18 00:52:34]

Done.

+      var url = resource.documentURL.asParsedURL();
+      if (url && url.securityOrigin() === cookieDomain)
+        resourceURLs.push(resource.url);
+    }
+
+    SDK.ResourceTreeModel.fromTarget(this._target).forAllResources(populateResourceURLs);
+    SDK.Cookies.getCookiesAsync(this._target, resourceURLs, this._updateWithCookies.bind(this));
   }
 
   /**
    * @param {!Array.<!SDK.Cookie>} allCookies
    */
   _updateWithCookies(allCookies) {
-    this._cookies = this._filterCookiesForDomain(allCookies);
+    this._cookies = allCookies;
+    this._totalSize = allCookies.reduce((size, cookie) => size + cookie.size(), 0);

[pfeldman, 2017/01/13 02:17:34]

Not sure why total size would matter :)

[phulce, 2017/01/18 00:52:34]

it's pre-existing, used for display

 
     if (!this._cookies.length) {
       // Nothing to show.
       this._emptyWidget.show(this.element);
       this._filterButton.setEnabled(false);
       this._clearButton.setEnabled(false);
       this._deleteButton.setEnabled(false);
       if (this._cookiesTable)
         this._cookiesTable.detach();
       return;
     }
 
     if (!this._cookiesTable) {
       this._cookiesTable =
           new CookieTable.CookiesTable(false, this._update.bind(this), this._enableDeleteButton.bind(this));
     }
 
-    var shownCookies = this._filterCookiesForFilters(this._cookies);
+    var shownCookies = this._filterCookies(this._cookies);
     this._cookiesTable.setCookies(shownCookies);
     this._emptyWidget.detach();
     this._cookiesTable.show(this.element);
     this._filterBar.show(this.element);
     this._treeElement.subtitle =
         String.sprintf(Common.UIString('%d cookies (%s)'), this._cookies.length, Number.bytesToString(this._totalSize));
     this._filterButton.setEnabled(true);
     this._clearButton.setEnabled(true);
     this._deleteButton.setEnabled(!!this._cookiesTable.selectedCookie());
   }
 
   /**
    * @param {!Array.<!SDK.Cookie>} cookies
    */
-  _filterCookiesForFilters(cookies) {
+  _filterCookies(cookies) {
     if (!this._filterRegex)
       return cookies;
 
     return cookies.filter(cookie => {
       const candidate = `${cookie.name()} ${cookie.value()} ${cookie.domain()}`;
       return this._filterRegex.test(candidate);
     });
   }
 
-  /**
-   * @param {!Array.<!SDK.Cookie>} allCookies
-   */
-  _filterCookiesForDomain(allCookies) {
-    var cookies = [];
-    var resourceURLsForDocumentURL = [];
-    this._totalSize = 0;
-
-    /**
-     * @this {Resources.CookieItemsView}
-     */
-    function populateResourcesForDocuments(resource) {
-      var url = resource.documentURL.asParsedURL();
-      if (url && url.securityOrigin() === this._cookieDomain)
-        resourceURLsForDocumentURL.push(resource.url);
-    }
-    Bindings.forAllResources(populateResourcesForDocuments.bind(this));
-
-    for (var i = 0; i < allCookies.length; ++i) {
-      var pushed = false;
-      var size = allCookies[i].size();
-      for (var j = 0; j < resourceURLsForDocumentURL.length; ++j) {
-        var resourceURL = resourceURLsForDocumentURL[j];
-        if (SDK.Cookies.cookieMatchesResourceURL(allCookies[i], resourceURL)) {
-          this._totalSize += size;
-          if (!pushed) {
-            pushed = true;
-            cookies.push(allCookies[i]);
-          }
-        }
-      }
-    }
-    return cookies;
-  }
-
   clear() {
     this._cookiesTable.clear();
     this._update();
   }
 
   /**
    * @param {!Common.Event} event
    */
   _clearButtonClicked(event) {
     this.clear();
@@ skipping 22 matching lines @@
   }
 
   _contextMenu(event) {
     if (!this._cookies.length) {
       var contextMenu = new UI.ContextMenu(event);
       contextMenu.appendItem(Common.UIString('Refresh'), this._update.bind(this));
       contextMenu.show();
     }
   }
 };