[DevTools] Separate text autosizing from device metrics override.

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 79 matching lines @@
 /**
  * @param {string} description
  * @param {string} userAgent
  * @constructor
  */
 WebInspector.OverridesSupport.Device = function(description, userAgent)
 {
     this.width = 800;
     this.height = 600;
     this.deviceScaleFactor = 1;
-    this.textAutosizing = true;
     this.userAgent = userAgent;
     this.touch = true;
     this.viewport = true;
 
     var splitMetrics = description.split("x");
     if (splitMetrics.length >= 3) {
         this.width = parseInt(splitMetrics[0], 10);
         this.height = parseInt(splitMetrics[1], 10);
         this.deviceScaleFactor = parseFloat(splitMetrics[2]);
     }
@@ skipping 393 matching lines @@
      */
     emulateDevice: function(device)
     {
         this._deviceMetricsChangedListenerMuted = true;
         this._userAgentChangedListenerMuted = true;
         this.settings.userAgent.set(device.userAgent);
         this.settings.emulateResolution.set(true);
         this.settings.deviceWidth.set(device.width);
         this.settings.deviceHeight.set(device.height);
         this.settings.deviceScaleFactor.set(device.deviceScaleFactor);
-        this.settings.deviceTextAutosizing.set(device.textAutosizing);
         this.settings.emulateTouch.set(device.touch);
         this.settings.emulateViewport.set(device.viewport);
         delete this._deviceMetricsChangedListenerMuted;
         delete this._userAgentChangedListenerMuted;
 
         if (this._initialized) {
             this._deviceMetricsChanged();
             this._userAgentChanged();
         }
     },
 
     reset: function()
     {
         this._deviceMetricsChangedListenerMuted = true;
         this._userAgentChangedListenerMuted = true;
         this.settings.userAgent.set("");
         this.settings.emulateResolution.set(false);
         this.settings.deviceScaleFactor.set(0);
-        this.settings.deviceTextAutosizing.set(false);
         this.settings.emulateTouch.set(false);
         this.settings.emulateViewport.set(false);
         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;
 
         if (this._initialized) {
             this._deviceMetricsChanged();
             this._userAgentChanged();
         }
     },
 
     /**
      * @param {!WebInspector.OverridesSupport.Device} device
      * @return {boolean}
      */
     isEmulatingDevice: function(device)
     {
         return this.settings.userAgent.get() === device.userAgent
             && this.settings.deviceWidth.get() === device.width
             && this.settings.deviceHeight.get() === device.height
             && this.settings.deviceScaleFactor.get() === device.deviceScaleFactor
-            && this.settings.deviceTextAutosizing.get() === device.textAutosizing
             && this.settings.emulateTouch.get() === device.touch
             && this.settings.emulateViewport.get() === device.viewport
             && this.settings.emulateResolution.get();
     },
 
     /**
      * @param {boolean} suspended
      */
     setTouchEmulationSuspended: function(suspended)
     {
@@ skipping 12 matching lines @@
         this._initialized = true;
 
         this.settings._emulationEnabled.addChangeListener(this._userAgentChanged, this);
         this.settings.userAgent.addChangeListener(this._userAgentChanged, this);
 
         this.settings._emulationEnabled.addChangeListener(this._deviceMetricsChanged, this);
         this.settings.emulateResolution.addChangeListener(this._deviceMetricsChanged, this);
         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._emulationEnabled.addChangeListener(this._geolocationPositionChanged, this);
         this.settings.overrideGeolocation.addChangeListener(this._geolocationPositionChanged, this);
         this.settings.geolocationOverride.addChangeListener(this._geolocationPositionChanged, this);
 
         this.settings._emulationEnabled.addChangeListener(this._deviceOrientationChanged, this);
         this.settings.overrideDeviceOrientation.addChangeListener(this._deviceOrientationChanged, this);
         this.settings.deviceOrientationOverride.addChangeListener(this._deviceOrientationChanged, this);
@@ skipping 122 matching lines @@
 
         /**
          * @param {!WebInspector.Throttler.FinishCallback} finishCallback
          * @this {WebInspector.OverridesSupport}
          */
         function setDeviceMetricsOverride(finishCallback)
         {
             PageAgent.setDeviceMetricsOverride(
                 overrideWidth, overrideHeight, this.settings.deviceScaleFactor.get(),
                 this.settings.emulateViewport.get(), this._pageResizer ? false : this.settings.deviceFitWindow.get(), scale, 0, 0,
-                this.settings.deviceTextAutosizing.get(), this._fontScaleFactor(overrideWidth || dipWidth, overrideHeight || dipHeight),
                 apiCallback.bind(this, finishCallback));
         }
 
         /**
          * @param {!WebInspector.Throttler.FinishCallback} finishCallback
          * @this {WebInspector.OverridesSupport}
          */
         function clearDeviceMetricsOverride(finishCallback)
         {
             PageAgent.clearDeviceMetricsOverride(apiCallback.bind(this, finishCallback));
@@ skipping 160 matching lines @@
 
         this.settings = {};
         this.settings._emulationEnabled = WebInspector.settings.createSetting("emulationEnabled", false);
 
         this.settings.userAgent = WebInspector.settings.createSetting("userAgent", "");
 
         this.settings.emulateResolution = WebInspector.settings.createSetting("emulateResolution", true);
         this.settings.deviceWidth = WebInspector.settings.createSetting("deviceWidth", 360);
         this.settings.deviceHeight = WebInspector.settings.createSetting("deviceHeight", 640);
         this.settings.deviceScaleFactor = WebInspector.settings.createSetting("deviceScaleFactor", 0);
-        this.settings.deviceTextAutosizing = WebInspector.settings.createSetting("deviceTextAutosizing", false);
         this.settings.deviceFitWindow = WebInspector.settings.createSetting("deviceFitWindow", true);
         // FIXME: rename viewport to mobile everywhere in the code.
         this.settings.emulateViewport = WebInspector.settings.createSetting("emulateViewport", false);
 
         this.settings.emulateTouch = WebInspector.settings.createSetting("emulateTouch", false);
 
         this.settings.overrideGeolocation = WebInspector.settings.createSetting("overrideGeolocation", false);
         this.settings.geolocationOverride = WebInspector.settings.createSetting("geolocationOverride", "");
 
         this.settings.overrideDeviceOrientation = WebInspector.settings.createSetting("overrideDeviceOrientation", false);
@@ skipping 37 matching lines @@
     /**
      * @return {boolean}
      */
     networkThroughputIsLimited: function()
     {
         var conditions = this.settings.networkConditions.get();
         return conditions.throughput !== WebInspector.OverridesSupport._networkThroughputUnlimitedValue;
     },
 
     /**
-     * Compute the font scale factor.
-     *
-     * Chromium on Android uses a device scale adjustment for fonts used in text autosizing for
-     * improved legibility. This function computes this adjusted value for text autosizing.
-     *
-     * For a description of the Android device scale adjustment algorithm, see:
-     *     chrome/browser/chrome_content_browser_client.cc, GetFontScaleMultiplier(...)
-     *
-     * @param {number} width
-     * @param {number} height
-     * @return {number} font scale factor.
-     */
-    _fontScaleFactor: function(width, height)
-    {
-        if (!this.emulationEnabled())
-            return 1;
-        var deviceScaleFactor = this.settings.deviceScaleFactor.get();
-
-        if (!width || !height || !deviceScaleFactor)
-            return 1;
-
-        var minWidth = Math.min(width, height) / deviceScaleFactor;
-
-        var kMinFSM = 1.05;
-        var kWidthForMinFSM = 320;
-        var kMaxFSM = 1.3;
-        var kWidthForMaxFSM = 800;
-
-        if (minWidth <= kWidthForMinFSM)
-            return kMinFSM;
-        if (minWidth >= kWidthForMaxFSM)
-            return kMaxFSM;
-
-        // The font scale multiplier varies linearly between kMinFSM and kMaxFSM.
-        var ratio = (minWidth - kWidthForMinFSM) / (kWidthForMaxFSM - kWidthForMinFSM);
-        return ratio * (kMaxFSM - kMinFSM) + kMinFSM;
-    },
-
-    /**
      * @param {!Document} document
      * @return {!Element}
      */
     createDeviceSelect: function(document)
     {
         var deviceSelectElement = document.createElement("select");
 
         var selectDeviceOption = new Option(WebInspector.UIString("<Select model>"), WebInspector.UIString("<Select model>"));
         selectDeviceOption.device = new WebInspector.OverridesSupport.Device("", "");
         deviceSelectElement.add(selectDeviceOption);
@@ skipping 19 matching lines @@
             }
         }
 
         deviceSelectElement.addEventListener("change", deviceSelected, false);
 
         var emulatedSettingChangedMuted = false;
         WebInspector.overridesSupport.settings.emulateResolution.addChangeListener(emulatedSettingChanged);
         WebInspector.overridesSupport.settings.deviceWidth.addChangeListener(emulatedSettingChanged);
         WebInspector.overridesSupport.settings.deviceHeight.addChangeListener(emulatedSettingChanged);
         WebInspector.overridesSupport.settings.deviceScaleFactor.addChangeListener(emulatedSettingChanged);
-        WebInspector.overridesSupport.settings.deviceTextAutosizing.addChangeListener(emulatedSettingChanged);
         WebInspector.overridesSupport.settings.emulateViewport.addChangeListener(emulatedSettingChanged);
         WebInspector.overridesSupport.settings.emulateTouch.addChangeListener(emulatedSettingChanged);
         WebInspector.overridesSupport.settings.userAgent.addChangeListener(emulatedSettingChanged);
         emulatedSettingChanged();
 
         function deviceSelected()
         {
             if (deviceSelectElement.selectedIndex === 0)
                 return;
 
@@ skipping 92 matching lines @@
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 
 /**
  * @type {!WebInspector.OverridesSupport}
  */
 WebInspector.overridesSupport;