Merge to 2623 "[DevTools] Fix various bugs in Device Mode."

third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @param {function()} updateCallback
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.DeviceModeModel = function(updateCallback)
 {
     this._updateCallback = updateCallback;
     this._screenRect = new WebInspector.Rect(0, 0, 1, 1);
     this._visiblePageRect = new WebInspector.Rect(0, 0, 1, 1);
     this._availableSize = new Size(1, 1);
     this._preferredSize = new Size(1, 1);
     this._initialized = false;
     this._deviceMetricsThrottler = new WebInspector.Throttler(0);
     this._appliedDeviceSize = new Size(1, 1);
     this._currentDeviceScaleFactor = window.devicePixelRatio;
     this._appliedDeviceScaleFactor = 0;
 
     this._scaleSetting = WebInspector.settings.createSetting("emulation.deviceScale", 1);
-    this._scaleSetting.addChangeListener(this._scaleSettingChanged, this);
     // We've used to allow zero before.
     if (!this._scaleSetting.get())
         this._scaleSetting.set(1);
+    this._scaleSetting.addChangeListener(this._scaleSettingChanged, this);
+
     this._widthSetting = WebInspector.settings.createSetting("emulation.deviceWidth", 400);
+    if (this._widthSetting.get() < WebInspector.DeviceModeModel.MinDeviceSize)
+        this._widthSetting.set(WebInspector.DeviceModeModel.MinDeviceSize);
+    if (this._widthSetting.get() > WebInspector.DeviceModeModel.MaxDeviceSize)
+        this._widthSetting.set(WebInspector.DeviceModeModel.MaxDeviceSize);
     this._widthSetting.addChangeListener(this._widthSettingChanged, this);
+
     this._heightSetting = WebInspector.settings.createSetting("emulation.deviceHeight", 0);
+    if (this._heightSetting.get() && this._heightSetting.get() < WebInspector.DeviceModeModel.MinDeviceSize)
+        this._heightSetting.set(WebInspector.DeviceModeModel.MinDeviceSize);
+    if (this._heightSetting.get() > WebInspector.DeviceModeModel.MaxDeviceSize)
+        this._heightSetting.set(WebInspector.DeviceModeModel.MaxDeviceSize);
     this._heightSetting.addChangeListener(this._heightSettingChanged, this);
+
     this._uaSetting = WebInspector.settings.createSetting("emulation.deviceUA", WebInspector.DeviceModeModel.UA.Mobile);
     this._uaSetting.addChangeListener(this._uaSettingChanged, this);
     this._deviceScaleFactorSetting = WebInspector.settings.createSetting("emulation.deviceScaleFactor", 0);
     this._deviceScaleFactorSetting.addChangeListener(this._deviceScaleFactorSettingChanged, this);
 
     /** @type {!WebInspector.DeviceModeModel.Type} */
     this._type = WebInspector.DeviceModeModel.Type.None;
     /** @type {?WebInspector.EmulatedDevice} */
     this._device = null;
     /** @type {?WebInspector.EmulatedDevice.Mode} */
@@ skipping 21 matching lines @@
     Device: "Device"
 }
 
 /** @enum {string} */
 WebInspector.DeviceModeModel.UA = {
     Mobile: "Mobile",
     Desktop: "Desktop",
     DesktopTouch: "DesktopTouch"
 }
 
+WebInspector.DeviceModeModel.MinDeviceSize = 50;
 WebInspector.DeviceModeModel.MaxDeviceSize = 9999;
 
 /**
  * @param {string} value
  * @return {string}
  */
 WebInspector.DeviceModeModel.deviceSizeValidator = function(value)
 {
-    if (/^[\d]+$/.test(value) && value > 0 && value <= WebInspector.DeviceModeModel.MaxDeviceSize)
+    if (/^[\d]+$/.test(value) && value >= WebInspector.DeviceModeModel.MinDeviceSize && value <= WebInspector.DeviceModeModel.MaxDeviceSize)
         return "";
     return WebInspector.UIString("Value must be positive integer");
 }
 
 WebInspector.DeviceModeModel._touchEventsScriptIdSymbol = Symbol("DeviceModeModel.touchEventsScriptIdSymbol");
 WebInspector.DeviceModeModel._defaultMobileUserAgent = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36";
 WebInspector.DeviceModeModel._defaultMobileScaleFactor = 2;
 
 WebInspector.DeviceModeModel.prototype = {
     /**
@@ skipping 505 matching lines @@
         if (!this._target || orientation === this._screenOrientation)
             return;
 
         this._screenOrientation = orientation;
         if (!this._screenOrientation)
             this._target.screenOrientationAgent().clearScreenOrientationOverride();
         else
             this._target.screenOrientationAgent().setScreenOrientationOverride(this._screenOrientation === "landscapePrimary" ? 90 : 0, /** @type {!ScreenOrientationAgent.OrientationType} */ (this._screenOrientation));
     }
 }