[DevTools] If no device frame art is available, ensure neutral inset values are defined when applyi…

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 416 matching lines @@
     /**
      * @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 = (this._deviceOutlineSetting.get() && Runtime.experiments.isEnabled("deviceFrames")) ? orientation.outlineInsets : new Insets(0,0,0,0);

[dgozman, 2016/04/27 18:48:16]

Let's fix here instead:

var outline = new Insets(0, 0, 0, 0);
if (Runtime.experiments.isEnabled("deviceFrames") &&
this._deviceOutlineSetting.get())
    outline = orientation.outlineInsets || outline;

[mmccoy1, 2016/04/27 20:23:52]

Right, thanks!

             this._fitScale = this._calculateFitScale(orientation.width, orientation.height);
             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);
@@ skipping 46 matching lines @@
      * @param {string} userAgent
      */
     _applyUserAgent: function(userAgent)
     {
         WebInspector.multitargetNetworkManager.setUserAgentOverride(userAgent);
     },
 
     /**
      * @param {!Size} screenSize
      * @param {!Insets} insets
      * @param {!Insets|null} outline

[dgozman, 2016/04/27 18:48:16]

... and mark this as non-null.

[mmccoy1, 2016/04/27 20:23:52]

Done.

      * @param {number} scale
      * @param {number} deviceScaleFactor
      * @param {boolean} mobile
      * @param {string} screenOrientation
      * @param {boolean} resetPageScaleFactor
      */
     _applyDeviceMetrics: function(screenSize, insets, outline, scale, deviceScaleFactor, mobile, screenOrientation, resetPageScaleFactor)
     {
         screenSize.width = Math.max(1, Math.floor(screenSize.width));
         screenSize.height = Math.max(1, Math.floor(screenSize.height));
 
         var pageWidth = screenSize.width - insets.left - insets.right;
         var pageHeight = screenSize.height - insets.top - insets.bottom;
 
         var positionX = insets.left;
         var positionY = insets.top;
         var screenOrientationAngle = screenOrientation === "landscapePrimary" ? 90 : 0;
 
         this._appliedDeviceSize = screenSize;
         this._appliedDeviceScaleFactor = deviceScaleFactor || window.devicePixelRatio;
+        if (!outline)
+          outline = new Insets(0,0,0,0);
+
         this._screenRect = new WebInspector.Rect(
             Math.max(0, (this._availableSize.width - screenSize.width * scale) / 2),
             outline.top * scale,
             screenSize.width * scale,
             screenSize.height * scale);
         this._outlineRect = new WebInspector.Rect(
             Math.max(0, this._screenRect.left - outline.left * scale),
             0,
             (outline.left + screenSize.width + outline.right) * scale,
             (outline.top + screenSize.height + outline.bottom) * scale);
@@ skipping 51 matching lines @@
 
     /**
      * @param {boolean} touchEnabled
      * @param {boolean} mobile
      */
     _applyTouch: function(touchEnabled, mobile)
     {
         WebInspector.MultitargetTouchModel.instance().setTouchEnabled(touchEnabled, mobile);
     }
 }