DevTools: make responsive design a master switch for emulation.

Source/devtools/front_end/sdk/OverridesSupport.js

 /*
  * Copyright (C) 2012 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 462 matching lines @@
     ["320 Kbps", 320 * 1024 / 8],
     ["640 Kbps (3G)", 640 * 1024 / 8],
     ["1 Mbps", 1024 * 1024 / 8],
     ["2 Mbps (802.11b)", 2048 * 1024 / 8]
 ];
 
 WebInspector.OverridesSupport.prototype = {
     /**
      * @return {boolean}
      */
-    responsiveDesignAvailable: function()
+    _responsiveDesignEnabledOrUnavailable: function()
     {
-        return this._responsiveDesignAvailable;
+        return !this._responsiveDesignAvailable || WebInspector.settings.responsiveDesignEnabled.get();
     },
 
     /**
      * @param {?WebInspector.OverridesSupport.PageResizer} pageResizer
      */
     setPageResizer: function(pageResizer)
     {
         if (pageResizer === this._pageResizer)
             return;
 
@@ skipping 70 matching lines @@
         this._addEmulateDeviceListener(this._deviceMetricsChanged);
         this.settings.deviceWidth.addChangeListener(this._deviceMetricsChanged, this);
         this.settings.deviceHeight.addChangeListener(this._deviceMetricsChanged, this);
         this.settings.deviceScaleFactor.addChangeListener(this._deviceMetricsChanged, this);
         this.settings.deviceTextAutosizing.addChangeListener(this._deviceMetricsChanged, this);
         this.settings.emulateViewport.addChangeListener(this._deviceMetricsChanged, this);
         this.settings.deviceFitWindow.addChangeListener(this._deviceMetricsChanged, this);
 
         this.settings.overrideGeolocation.addChangeListener(this._geolocationPositionChanged, this);
         this.settings.geolocationOverride.addChangeListener(this._geolocationPositionChanged, this);
+        WebInspector.settings.responsiveDesignEnabled.addChangeListener(this._geolocationPositionChanged, this);
 
         this.settings.overrideDeviceOrientation.addChangeListener(this._deviceOrientationChanged, this);
         this.settings.deviceOrientationOverride.addChangeListener(this._deviceOrientationChanged, this);
+        WebInspector.settings.responsiveDesignEnabled.addChangeListener(this._deviceOrientationChanged, this);
 
         this._addEmulateDeviceListener(this._emulateTouchEventsChanged);
         this.settings.deviceTouch.addChangeListener(this._emulateTouchEventsChanged, this);
         this.settings.sensorsTouch.addChangeListener(this._emulateTouchEventsChanged, this);
 
         this.settings.overrideCSSMedia.addChangeListener(this._cssMediaChanged, this);
         this.settings.emulatedCSSMedia.addChangeListener(this._cssMediaChanged, this);
+        WebInspector.settings.responsiveDesignEnabled.addChangeListener(this._cssMediaChanged, this);
 
-        this.settings.emulateNetworkConditions.addChangeListener(this._networkConditionsChanged, this);
-        this.settings.networkConditionsDomains.addChangeListener(this._networkConditionsChanged, this);
-        this.settings.networkConditionsThroughput.addChangeListener(this._networkConditionsChanged, this);
+        if (WebInspector.experimentsSettings.networkConditions.isEnabled()) {
+            this.settings.emulateNetworkConditions.addChangeListener(this._networkConditionsChanged, this);
+            this.settings.networkConditionsDomains.addChangeListener(this._networkConditionsChanged, this);
+            this.settings.networkConditionsThroughput.addChangeListener(this._networkConditionsChanged, this);
+            WebInspector.settings.responsiveDesignEnabled.addChangeListener(this._networkConditionsChanged, this);
+        }
 
         WebInspector.settings.showMetricsRulers.addChangeListener(this._showRulersChanged, this);
 
         if (this.settings.overrideDeviceOrientation.get())
             this._deviceOrientationChanged();
 
         if (this.settings.overrideGeolocation.get())
             this._geolocationPositionChanged();
 
         if (this.isTouchEmulationEnabled())
             this._emulateTouchEventsChanged();
 
         if (this.settings.overrideCSSMedia.get())
             this._cssMediaChanged();
 
         if (this.settings.emulateDevice.get())
             this._deviceMetricsChanged();
 
         if (this.userAgentOverride())
             this._userAgentChanged();
 
-        if (this.settings.emulateNetworkConditions.get())
+        if (WebInspector.experimentsSettings.networkConditions.isEnabled() && this.settings.emulateNetworkConditions.get())
             this._networkConditionsChanged();
 
         this._showRulersChanged();
     },
 
     /**
      * @param {function(this:WebInspector.OverridesSupport)} listener
      */
     _addEmulateDeviceListener: function(listener)
     {
         this.settings.emulateDevice.addChangeListener(listener, this);
-        WebInspector.settings.responsiveDesign.enabled.addChangeListener(listener, this);
+        WebInspector.settings.responsiveDesignEnabled.addChangeListener(listener, this);
     },
 
     _userAgentChanged: function()
     {
         if (this._userAgentChangedListenerMuted)
             return;
         var userAgent = this.userAgentOverride();
         NetworkAgent.setUserAgentOverride(userAgent);
         if (this._userAgent !== userAgent)
             this._updateUserAgentWarningMessage(WebInspector.UIString("You might need to reload the page for proper user agent spoofing and viewport rendering."));
@@ skipping 20 matching lines @@
                 this.settings.deviceHeight.set(height);
         }
     },
 
     _deviceMetricsChanged: function()
     {
         this._showRulersChanged();
 
         if (this._deviceMetricsChangedListenerMuted)
             return;
-        var responsiveDesignAvailableAndDisabled = this._responsiveDesignAvailable && (!WebInspector.settings.responsiveDesign.enabled.get() || !this._pageResizer);
         var emulateDevice = this.settings.emulateDevice.get();
-        if (responsiveDesignAvailableAndDisabled || !emulateDevice) {

[dgozman, 2014/06/17 16:20:48]

This is now broken.

[pfeldman, 2014/06/17 16:25:03]

Oops. Thanks.

+        if (!emulateDevice) {
             this._deviceMetricsThrottler.schedule(clearDeviceMetricsOverride.bind(this));
             if (this._pageResizer && !emulateDevice)
                 this._pageResizer.update(0, 0, 0);
             return;
         }
 
         var dipWidth = emulateDevice ? this.settings.deviceWidth.get() : 0;
         var dipHeight = emulateDevice ? this.settings.deviceHeight.get() : 0;
 
         // Disable override without checks.
@@ skipping 62 matching lines @@
         }
     },
 
     _deviceMetricsOverrideAppliedForTest: function()
     {
         // Used for sniffing in tests.
     },
 
     _geolocationPositionChanged: function()
     {
-        if (!this.settings.overrideGeolocation.get()) {
+        if (!this._responsiveDesignEnabledOrUnavailable() || !this.settings.overrideGeolocation.get()) {
             GeolocationAgent.clearGeolocationOverride();
             return;
         }
         var geolocation = WebInspector.OverridesSupport.GeolocationPosition.parseSetting(this.settings.geolocationOverride.get());
         if (geolocation.error)
             GeolocationAgent.setGeolocationOverride();
         else
             GeolocationAgent.setGeolocationOverride(geolocation.latitude, geolocation.longitude, 150);
         this.maybeHasActiveOverridesChanged();
     },
 
     _deviceOrientationChanged: function()
     {
-        if (!this.settings.overrideDeviceOrientation.get()) {
+        if (!this._responsiveDesignEnabledOrUnavailable() || !this.settings.overrideDeviceOrientation.get()) {
             PageAgent.clearDeviceOrientationOverride();
             return;
         }
 
         var deviceOrientation = WebInspector.OverridesSupport.DeviceOrientation.parseSetting(this.settings.deviceOrientationOverride.get());
         PageAgent.setDeviceOrientationOverride(deviceOrientation.alpha, deviceOrientation.beta, deviceOrientation.gamma);
         this.maybeHasActiveOverridesChanged();
     },
 
     _emulateTouchEventsChanged: function()
     {
         var emulateTouch = this.isTouchEmulationEnabled();
         var targets = WebInspector.targetManager.targets();
         for (var i = 0; i < targets.length; ++i)
             targets[i].domModel.emulateTouchEventObjects(emulateTouch);
         this.maybeHasActiveOverridesChanged();
     },
 
     _cssMediaChanged: function()
     {
         if (this.isInspectingDevice() && this.settings.overrideCSSMedia.get())
             return;
 
-        PageAgent.setEmulatedMedia(this.settings.overrideCSSMedia.get() ? this.settings.emulatedCSSMedia.get() : "");
+        PageAgent.setEmulatedMedia(this._responsiveDesignEnabledOrUnavailable() && this.settings.overrideCSSMedia.get() ? this.settings.emulatedCSSMedia.get() : "");
         var targets = WebInspector.targetManager.targets();
         for (var i = 0; i < targets.length; ++i)
             targets[i].cssModel.mediaQueryResultChanged();
         this.maybeHasActiveOverridesChanged();
     },
 
     _networkConditionsChanged: function()
     {
-        if (!this.settings.emulateNetworkConditions.get()) {
+        if (!this._responsiveDesignEnabledOrUnavailable() || !this.settings.emulateNetworkConditions.get()) {
             NetworkAgent.emulateNetworkConditions([], 0, false);
         } else {
             var domainsString = this.settings.networkConditionsDomains.get().trim();
             var domains = domainsString ? domainsString.split(",").map(function (s) { return s.trim(); }) : [];
             var throughput = this.settings.networkConditionsThroughput.get();
             var offline = !throughput;
             NetworkAgent.emulateNetworkConditions(domains, throughput, offline);
         }
         this.maybeHasActiveOverridesChanged();
     },
@@ skipping 22 matching lines @@
         return this._hasActiveOverrides;
     },
 
     maybeHasActiveOverridesChanged: function()
     {
         var hasActiveOverrides =
             !!this.userAgentOverride() ||
             (this.settings.emulateDevice.get() && !this.isInspectingDevice()) ||
             this.settings.overrideGeolocation.get() ||
             this.settings.overrideDeviceOrientation.get() ||
+            this.settings.emulateNetworkConditions.get() ||
             this.isTouchEmulationEnabled() ||
             (this.settings.overrideCSSMedia.get() && !this.isInspectingDevice());
         if (this._hasActiveOverrides !== hasActiveOverrides) {
             this._hasActiveOverrides = hasActiveOverrides;
             this.dispatchEventToListeners(WebInspector.OverridesSupport.Events.HasActiveOverridesChanged);
         }
     },
 
     _onMainFrameNavigated: function()
     {
@@ skipping 96 matching lines @@
     isInspectingDevice: function()
     {
         return !!this._target && this._target.isMobile();
     },
 
     /**
      * @return {boolean}
      */
     isEmulateDeviceEnabled: function()
     {
-        return this.settings.emulateDevice.get() && (!this._responsiveDesignAvailable || WebInspector.settings.responsiveDesign.enabled.get());
+        return this.settings.emulateDevice.get() && WebInspector.settings.responsiveDesignEnabled.get();
     },
 
     /**
      * @return {boolean}
      */
     isTouchEmulationEnabled: function()
     {
         return !this.hasTouchInputs() && ((this.isEmulateDeviceEnabled() && this.settings.deviceTouch.get()) || this.settings.sensorsTouch.get());
     },
 
@@ skipping 181 matching lines @@
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 
 /**
  * @type {!WebInspector.OverridesSupport}
  */
 WebInspector.overridesSupport;