[Devtools] Changed protocol to use setBlockedURLs instead of add/remove

third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.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 667 matching lines @@
 };
 
 /**
  * @implements {SDK.TargetManager.Observer}
  * @unrestricted
  */
 SDK.MultitargetNetworkManager = class extends Common.Object {
   constructor() {
     super();
 
-    /** @type {!Set<string>} */
-    this._blockedURLs = new Set();
-    this._blockedSetting = Common.moduleSetting('networkBlockedURLs');
-    this._blockedSetting.addChangeListener(this._updateBlockedURLs, this);
-    this._blockedSetting.set([]);
-    this._updateBlockedURLs();
-
     this._userAgentOverride = '';
     this._isRequestBlockingEnabled = false;
     /** @type {!Set<!Protocol.NetworkAgent>} */
     this._agents = new Set();
     /** @type {!SDK.NetworkManager.Conditions} */
     this._networkConditions = SDK.NetworkManager.NoThrottlingConditions;
 
+    /** @type {!Set<string>} */

[allada, 2017/02/16 22:14:49]

This was moved because this._agents is needed in _updateBlockedURLs.

+    this._blockedURLs = new Set();
+    this._blockedSetting = Common.moduleSetting('networkBlockedURLs');
+    this._blockedSetting.addChangeListener(this._updateBlockedURLs, this);
+    this._blockedSetting.set([]);
+    this._updateBlockedURLs();
+
     SDK.targetManager.observeTargets(this, SDK.Target.Capability.Network);
   }
 
   /**
    * @param {string} uaString
    * @return {string}
    */
   static patchUserAgentWithChromeVersion(uaString) {
     // Patches Chrome/CriOS version from user agent ("1.2.3.4" when user agent is: "Chrome/1.2.3.4").
     var chromeRegex = new RegExp('(?:^|\\W)Chrome/(\\S+)');
     var chromeMatch = navigator.userAgent.match(chromeRegex);
     if (chromeMatch && chromeMatch.length > 1)
       return String.sprintf(uaString, chromeMatch[1]);
     return uaString;
   }
 
   /**
    * @override
    * @param {!SDK.Target} target
    */
   targetAdded(target) {
     var networkAgent = target.networkAgent();
     if (this._extraHeaders)
       networkAgent.setExtraHTTPHeaders(this._extraHeaders);
     if (this._currentUserAgent())
       networkAgent.setUserAgentOverride(this._currentUserAgent());
-    for (var url of this._blockedURLs)
-      networkAgent.addBlockedURL(url);
+    if (this._isRequestBlockingEnabled)
+      networkAgent.setBlockedURLs(this._blockedURLs.valuesArray());
     this._agents.add(networkAgent);
     if (this.isThrottling())
       this._updateNetworkConditions(networkAgent);
   }
 
   /**
    * @override
    * @param {!SDK.Target} target
    */
   targetRemoved(target) {
@@ skipping 89 matching lines @@
   }
 
   /**
    * @param {string} userAgent
    */
   setCustomUserAgentOverride(userAgent) {
     this._customUserAgent = userAgent;
     this._updateUserAgentOverride();
   }
 
+  _updateBackendBlockedURLs() {
+    var urls = /** @type {!Array<string>} */ ([]);
+    if (this._isRequestBlockingEnabled)
+      urls = this._blockedURLs.valuesArray();
+    for (var agent of this._agents)
+      agent.setBlockedURLs(urls);
+  }
+
   _updateBlockedURLs() {
     var blocked = this._blockedSetting.get();
-    for (var url of blocked) {
-      if (!this._blockedURLs.has(url))
-        this._addBlockedURL(url);
-    }
-    for (var url of this._blockedURLs) {
-      if (blocked.indexOf(url) === -1)
-        this._removeBlockedURL(url);
-    }
+    this._blockedURLs = new Set(blocked);
+    this._updateBackendBlockedURLs();

[pfeldman, 2017/02/16 22:29:24]

inline backend update into this method.

[allada, 2017/02/17 00:58:06]

Done.

   }
 
   /**
    * @param {string} url
    */
   _addBlockedURL(url) {
     this._blockedURLs.add(url);

[pfeldman, 2017/02/16 22:29:24]

var blockedURLs = this._blockedSetting.get();
blockedURLs.push(url);
this._blockedSetting.set(blockedURLs);

[allada, 2017/02/17 00:58:06]

Done.

-    if (!this._isRequestBlockingEnabled)
-      return;
-    for (var agent of this._agents)
-      agent.addBlockedURL(url);
+    this._updateBackendBlockedURLs();
   }
 
   /**
    * @param {string} url
    */
   _removeBlockedURL(url) {
     this._blockedURLs.delete(url);
-    if (!this._isRequestBlockingEnabled)
-      return;
-    for (var agent of this._agents)
-      agent.removeBlockedURL(url);
+    this._updateBackendBlockedURLs();

[pfeldman, 2017/02/16 22:29:24]

var blockedURLs = this._blockedSetting.get();
blockedURLs.delete(url);
this._blockedSetting.set(blockedURLs);

[allada, 2017/02/17 00:58:06]

Done.

   }
 
   /**
    * @param {boolean} enabled
    */
   setRequestBlockingEnabled(enabled) {
     if (this._isRequestBlockingEnabled === enabled)
       return;
     this._isRequestBlockingEnabled = enabled;
-    if (enabled) {
-      for (var agent of this._agents)
-        this._blockedURLs.forEach(url => agent.addBlockedURL(url));
-    } else {
-      for (var agent of this._agents)
-        this._blockedURLs.forEach(url => agent.removeBlockedURL(url));
-    }
+    this._updateBackendBlockedURLs();

[pfeldman, 2017/02/16 22:29:24]

_updateBlockedURLs()

[allada, 2017/02/17 00:58:06]

Done.

     this.emit(new SDK.MultitargetNetworkManager.RequestBlockingEnabledChangedEvent());
   }
 
   isRequestBlockingEnabled() {
     return this._isRequestBlockingEnabled;
   }
 
   clearBrowserCache() {
     for (var agent of this._agents)
       agent.clearBrowserCache();
@@ skipping 45 matching lines @@
   UserAgentChanged: Symbol('UserAgentChanged')
 };
 
 /** @implements {Common.Emittable} */
 SDK.MultitargetNetworkManager.RequestBlockingEnabledChangedEvent = class {};
 
 /**
  * @type {!SDK.MultitargetNetworkManager}
  */
 SDK.multitargetNetworkManager;