[Devtools] Added Enable/Disable for request blocking in network

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
index 6392ba0d19a5f90120c415fa1a1b399cd4690292..666bdd63d2f28a73e70e584fe7c4601d3fbfc7ca 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
@@ -684,19 +684,19 @@ SDK.NetworkDispatcher = class {
 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._updateBlockedURLs();
-
     this._userAgentOverride = '';
     /** @type {!Set<!Protocol.NetworkAgent>} */
     this._agents = new Set();
     /** @type {!SDK.NetworkManager.Conditions} */
     this._networkConditions = SDK.NetworkManager.NoThrottlingConditions;
 
+    this._agentsHaveBlockedURLs = false;
+    this._blockedEnabledSetting = Common.moduleSetting('requestBlockingEnabled');

[pfeldman, 2017/03/07 02:37:56]

If you use it here, you need to declare it in this module (sdk). We are leaking
this UI aspect into sdk here, but I guess it is fine for now - settings are
headless.

[allada, 2017/03/07 21:54:04]

Done.

+    this._blockedEnabledSetting.addChangeListener(this._updateBlockedURLs, this);
+    this._blockedURLsSetting = Common.moduleSetting('networkBlockedURLs');
+    this._blockedURLsSetting.addChangeListener(this._updateBlockedURLs, this);
+    this._updateBlockedURLs();
+
     SDK.targetManager.observeTargets(this, SDK.Target.Capability.Network);
   }
 
@@ -723,8 +723,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
       networkAgent.setExtraHTTPHeaders(this._extraHeaders);
     if (this._currentUserAgent())
       networkAgent.setUserAgentOverride(this._currentUserAgent());
-    for (var url of this._blockedURLs)
-      networkAgent.addBlockedURL(url);
+    if (this._blockedEnabledSetting.get())
+      networkAgent.setBlockedURLs(this._blockedURLsSetting.get());
     this._agents.add(networkAgent);
     if (this.isThrottling())
       this._updateNetworkConditions(networkAgent);
@@ -835,33 +835,14 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
   }
 
   _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);
-    }
-  }
-
-  /**
-   * @param {string} url
-   */
-  _addBlockedURL(url) {
-    this._blockedURLs.add(url);
-    for (var agent of this._agents)
-      agent.addBlockedURL(url);
-  }
-
-  /**
-   * @param {string} url
-   */
-  _removeBlockedURL(url) {
-    this._blockedURLs.delete(url);
+    var urls = /** @type {!Array<string>} */ ([]);
+    if (this._blockedEnabledSetting.get())
+      urls = this._blockedURLsSetting.get();
+    if (!urls.length && !this._agentsHaveBlockedURLs)
+      return;
+    this._agentsHaveBlockedURLs = !!urls.length;
     for (var agent of this._agents)
-      agent.removeBlockedURL(url);
+      agent.setBlockedURLs(urls);
   }
 
   clearBrowserCache() {
@@ -915,7 +896,6 @@ SDK.MultitargetNetworkManager.Events = {
   UserAgentChanged: Symbol('UserAgentChanged')
 };
 
-
 /**
  * @type {!SDK.MultitargetNetworkManager}
  */