Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1356)

Unified Diff: Source/devtools/front_end/emulation/OverridesSupport.js

Issue 1186083003: [DevTools] Move network throttling to network panel. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged in device mode Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/devtools/front_end/emulation/OverridesUI.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/emulation/OverridesSupport.js
diff --git a/Source/devtools/front_end/emulation/OverridesSupport.js b/Source/devtools/front_end/emulation/OverridesSupport.js
index 43dafa4e733985a3e0e54a9de902aaa864443f5b..418abbf312a2f389f8d423cbc153289b7da934bd 100644
--- a/Source/devtools/front_end/emulation/OverridesSupport.js
+++ b/Source/devtools/front_end/emulation/OverridesSupport.js
@@ -66,8 +66,6 @@ WebInspector.OverridesSupport = function()
this.settings.overrideCSSMedia = WebInspector.settings.createSetting("overrideCSSMedia", false);
this.settings.emulatedCSSMedia = WebInspector.settings.createSetting("emulatedCSSMedia", "print");
- this.settings.networkConditions = WebInspector.settings.createSetting("networkConditions", {throughput: WebInspector.OverridesSupport.NetworkThroughputUnlimitedValue, latency: 0});
-
this.settings.javaScriptDisabled = WebInspector.moduleSetting("javaScriptDisabled");
}
@@ -258,11 +256,6 @@ WebInspector.OverridesSupport.deviceScaleFactorValidator = function(value)
return WebInspector.UIString("Value must be non-negative float");
}
-WebInspector.OverridesSupport.NetworkThroughputUnlimitedValue = -1;
-
-/** @typedef {{id: string, title: string, throughput: number, latency: number}} */
-WebInspector.OverridesSupport.NetworkConditionsPreset;
-
WebInspector.OverridesSupport._touchEventsScriptIdSymbol = Symbol("OverridesSupport.touchEventsScriptIdSymbol");
WebInspector.OverridesSupport.prototype = {
@@ -391,7 +384,6 @@ WebInspector.OverridesSupport.prototype = {
this.settings.overrideDeviceOrientation.set(false);
this.settings.overrideGeolocation.set(false);
this.settings.overrideCSSMedia.set(false);
- this.settings.networkConditions.set({throughput: WebInspector.OverridesSupport.NetworkThroughputUnlimitedValue, latency: 0});
delete this._deviceMetricsChangedListenerMuted;
delete this._userAgentChangedListenerMuted;
@@ -454,9 +446,6 @@ WebInspector.OverridesSupport.prototype = {
this.settings.overrideCSSMedia.addChangeListener(this._cssMediaChanged, this);
this.settings.emulatedCSSMedia.addChangeListener(this._cssMediaChanged, this);
- this.settings._emulationEnabled.addChangeListener(this._networkConditionsChanged, this);
- this.settings.networkConditions.addChangeListener(this._networkConditionsChanged, this);
-
this.settings.javaScriptDisabled.addChangeListener(this._javaScriptDisabledChanged, this);
this._javaScriptDisabledChanged();
@@ -482,9 +471,6 @@ WebInspector.OverridesSupport.prototype = {
this._target.emulationAgent().resetScrollAndPageScaleFactor();
this._userAgentChanged();
-
- if (this.networkThroughputIsLimited())
- this._networkConditionsChanged();
}
},
@@ -713,19 +699,6 @@ WebInspector.OverridesSupport.prototype = {
cssModel.mediaQueryResultChanged();
},
- _networkConditionsChanged: function()
- {
- if (!this.emulationEnabled() || !this.networkThroughputIsLimited()) {
- WebInspector.multitargetNetworkManager.emulateNetworkConditions(false, 0, 0);
- } else {
- var conditions = this.settings.networkConditions.get();
- var throughput = conditions.throughput;
- var latency = conditions.latency;
- var offline = !throughput && !latency;
- WebInspector.multitargetNetworkManager.emulateNetworkConditions(offline, latency, throughput);
- }
- },
-
_javaScriptDisabledChanged: function()
{
this._target.emulationAgent().setScriptExecutionDisabled(this.settings.javaScriptDisabled.get());
@@ -800,15 +773,6 @@ WebInspector.OverridesSupport.prototype = {
WebInspector.overridesSupport.settings.deviceHeight.set(width);
},
- /**
- * @return {boolean}
- */
- networkThroughputIsLimited: function()
- {
- var conditions = this.settings.networkConditions.get();
- return conditions.throughput !== WebInspector.OverridesSupport.NetworkThroughputUnlimitedValue;
- },
-
__proto__: WebInspector.Object.prototype
}
« no previous file with comments | « no previous file | Source/devtools/front_end/emulation/OverridesUI.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698