[DevTools] Polish device mode UI, include outline into screenshot.

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)
@@ skipping 118 matching lines @@
     {
         var resetPageScaleFactor = this._type !== type || this._device !== device || this._mode !== mode;
         this._type = type;
 
         if (type === WebInspector.DeviceModeModel.Type.Device) {
             console.assert(device && mode, "Must pass device and mode for device emulation");
             this._device = device;
             this._mode = mode;
             if (this._initialized) {
                 var orientation = device.orientationByName(mode.orientation);
-                this._scaleSetting.set(this._calculateFitScale(orientation.width, orientation.height));
+                this._scaleSetting.set(this._calculateFitScale(orientation.width, orientation.height, this._currentOutline()));
             }
         } else {
             this._device = null;
             this._mode = null;
         }
 
         if (type !== WebInspector.DeviceModeModel.Type.None)
             WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.DeviceModeEnabled);
         this._calculateAndEmulate(resetPageScaleFactor);
     },
@@ skipping 78 matching lines @@
     screenImage: function()
     {
         return (this._device && this._mode) ? this._device.modeImage(this._mode) : "";
     },
 
     /**
      * @return {string}
      */
     outlineImage: function()
     {
-        return (this._device && this._mode && Runtime.experiments.isEnabled("deviceFrames")) ?
-            this._device.outlineImage(this._mode) : "";
+        return (this._device && this._mode && Runtime.experiments.isEnabled("deviceFrames") && this._deviceOutlineSetting.get()) ? this._device.outlineImage(this._mode) : "";
     },
 
     /**
      * @return {!WebInspector.Rect}
      */
     outlineRect: function()
     {
         return this._outlineRect;
     },
 
@@ skipping 168 matching lines @@
 
     /**
      * @return {number}
      */
     _preferredScaledHeight: function()
     {
         return Math.floor(this._preferredSize.height / (this._scaleSetting.get() || 1));
     },
 
     /**
+     * @return {!Insets}
+     */
+    _currentOutline: function()
+    {
+        var outline = new Insets(0, 0, 0, 0);
+        if (this._type !== WebInspector.DeviceModeModel.Type.Device)
+            return outline;
+        var orientation = this._device.orientationByName(this._mode.orientation);
+        if (Runtime.experiments.isEnabled("deviceFrames") && this._deviceOutlineSetting.get())
+            outline = orientation.outlineInsets || outline;
+        return outline;
+    },
+
+    /**
      * @param {boolean} resetPageScaleFactor
      */
     _calculateAndEmulate: function(resetPageScaleFactor)
     {
         if (!this._target)
             this._onTargetAvailable = this._calculateAndEmulate.bind(this, resetPageScaleFactor);
 
         if (this._type === WebInspector.DeviceModeModel.Type.Device) {
             var orientation = this._device.orientationByName(this._mode.orientation);
-            var outline = new Insets(0, 20, 0, 0);
-            if (Runtime.experiments.isEnabled("deviceFrames") && this._deviceOutlineSetting.get())
-                outline = orientation.outlineInsets || outline;
-            this._fitScale = this._calculateFitScale(orientation.width, orientation.height);
+            var outline = this._currentOutline();
+            this._fitScale = this._calculateFitScale(orientation.width, orientation.height, outline);
             if (this._device.mobile())
                 this._appliedUserAgentType = this._device.touch() ? WebInspector.DeviceModeModel.UA.Mobile : WebInspector.DeviceModeModel.UA.MobileNoTouch;
             else
                 this._appliedUserAgentType = this._device.touch() ? WebInspector.DeviceModeModel.UA.DesktopTouch : WebInspector.DeviceModeModel.UA.Desktop;
             this._applyDeviceMetrics(new Size(orientation.width, orientation.height), this._mode.insets, outline, this._scaleSetting.get(), this._device.deviceScaleFactor, this._device.mobile(), this._mode.orientation == WebInspector.EmulatedDevice.Horizontal ? "landscapePrimary" : "portraitPrimary", resetPageScaleFactor);
             this._applyUserAgent(this._device.userAgent);
             this._applyTouch(this._device.touch(), this._device.mobile());
         } else if (this._type === WebInspector.DeviceModeModel.Type.None) {
             this._fitScale = this._calculateFitScale(this._availableSize.width, this._availableSize.height);
             this._appliedUserAgentType = WebInspector.DeviceModeModel.UA.Desktop;
-            this._applyDeviceMetrics(this._availableSize, new Insets(0, 0, 0, 0), new Insets(0, 20, 0, 0), 1, 0, false, "", resetPageScaleFactor);
+            this._applyDeviceMetrics(this._availableSize, new Insets(0, 0, 0, 0), new Insets(0, 0, 0, 0), 1, 0, false, "", resetPageScaleFactor);
             this._applyUserAgent("");
             this._applyTouch(false, false);
         } else if (this._type === WebInspector.DeviceModeModel.Type.Responsive) {
             var screenWidth = this._widthSetting.get();
             if (!screenWidth || screenWidth > this._preferredScaledWidth())
                 screenWidth = this._preferredScaledWidth();
             var screenHeight = this._heightSetting.get();
             if (!screenHeight || screenHeight > this._preferredScaledHeight())
                 screenHeight = this._preferredScaledHeight();
             var mobile = this._uaSetting.get() === WebInspector.DeviceModeModel.UA.Mobile || this._uaSetting.get() === WebInspector.DeviceModeModel.UA.MobileNoTouch;
             var defaultDeviceScaleFactor = mobile ? WebInspector.DeviceModeModel.defaultMobileScaleFactor : 0;
             this._fitScale = this._calculateFitScale(this._widthSetting.get(), this._heightSetting.get());
             this._appliedUserAgentType = this._uaSetting.get();
-            this._applyDeviceMetrics(new Size(screenWidth, screenHeight), new Insets(0, 0, 0, 0), new Insets(0, 20, 0, 0), this._scaleSetting.get(), this._deviceScaleFactorSetting.get() || defaultDeviceScaleFactor, mobile, screenHeight >= screenWidth ? "portraitPrimary" : "landscapePrimary", resetPageScaleFactor);
+            this._applyDeviceMetrics(new Size(screenWidth, screenHeight), new Insets(0, 0, 0, 0), new Insets(0, 0, 0, 0), this._scaleSetting.get(), this._deviceScaleFactorSetting.get() || defaultDeviceScaleFactor, mobile, screenHeight >= screenWidth ? "portraitPrimary" : "landscapePrimary", resetPageScaleFactor);
             this._applyUserAgent(mobile ? WebInspector.DeviceModeModel._defaultMobileUserAgent : "");
             this._applyTouch(this._uaSetting.get() === WebInspector.DeviceModeModel.UA.DesktopTouch || this._uaSetting.get() === WebInspector.DeviceModeModel.UA.Mobile, this._uaSetting.get() === WebInspector.DeviceModeModel.UA.Mobile);
         }
         if (this._target)
             this._target.renderingAgent().setShowViewportSizeOnResize(this._type === WebInspector.DeviceModeModel.Type.None);
         this._updateCallback.call(null);
     },
 
     /**
      * @param {number} screenWidth
      * @param {number} screenHeight
+     * @param {!Insets=} outline
      * @return {number}
      */
-    _calculateFitScale: function(screenWidth, screenHeight)
+    _calculateFitScale: function(screenWidth, screenHeight, outline)
     {
-        var scale = Math.min(screenWidth ? this._preferredSize.width / screenWidth : 1, screenHeight ? this._preferredSize.height / screenHeight : 1);
+        var outlineWidth = outline ? outline.left + outline.right : 0;
+        var outlineHeight = outline ? outline.top + outline.bottom : 0;
+        var scale = Math.min(screenWidth ? this._preferredSize.width / (screenWidth + outlineWidth) : 1, screenHeight ? this._preferredSize.height / (screenHeight + outlineHeight) : 1);
         return Math.min(scale, 1);
     },
 
     /**
      * @param {number} width
      * @param {number} height
      */
     setSizeAndScaleToFit: function(width, height)
     {
         this._scaleSetting.set(this._calculateFitScale(width, height));
@@ skipping 96 matching lines @@
 
     /**
      * @param {boolean} touchEnabled
      * @param {boolean} mobile
      */
     _applyTouch: function(touchEnabled, mobile)
     {
         WebInspector.MultitargetTouchModel.instance().setTouchEnabled(touchEnabled, mobile);
     }
 }