DevTools: fix incorrect device orientation bug

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

 // Copyright (c) 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
  * @extends {WebInspector.VBox}
  */
 WebInspector.SensorsView = function()
 {
@@ skipping 137 matching lines @@
             for (var j = 0; j < group.length; ++j)
                 groupElement.appendChild(new Option(group[j].title, group[j].orientation));
         }
         this._orientationSelectElement.selectedIndex = 0;
         fields.appendChild(this._orientationSelectElement);
         this._orientationSelectElement.addEventListener("change", this._orientationSelectChanged.bind(this));
 
         this._deviceOrientationFieldset = this._createDeviceOrientationOverrideElement(this._deviceOrientation);
 
         this._stageElement = orientationContent.createChild("div", "accelerometer-stage");
-        this._stageElement.title = WebInspector.UIString("shift+drag to rotate around the z-axis");
+        this._stageElement.title = WebInspector.UIString("Shift+drag to rotate around the y-axis");
         this._boxElement = this._stageElement.createChild("section", "accelerometer-box accelerometer-element");
 
         this._boxElement.createChild("section", "accelerometer-front accelerometer-element");
         this._boxElement.createChild("section", "accelerometer-top accelerometer-element");
         this._boxElement.createChild("section", "accelerometer-back accelerometer-element");
         this._boxElement.createChild("section", "accelerometer-left accelerometer-element");
         this._boxElement.createChild("section", "accelerometer-right accelerometer-element");
         this._boxElement.createChild("section", "accelerometer-bottom accelerometer-element");
 
-        WebInspector.installDragHandle(this._stageElement, this._onBoxDragStart.bind(this), this._onBoxDrag.bind(this), this._onBoxDragEnd.bind(this), "-webkit-grabbing", "-webkit-grab");
+        WebInspector.installDragHandle(this._stageElement, this._onBoxDragStart.bind(this), this._onBoxDrag.bind(this), null, "-webkit-grabbing", "-webkit-grab");
 
         fields.appendChild(this._deviceOrientationFieldset);
         this._enableOrientationFields(true);
         this._setBoxOrientation(this._deviceOrientation);
     },
 
     /**
      * @param {?boolean} disable
      */
     _enableOrientationFields: function(disable)
@@ skipping 130 matching lines @@
 
         cellElement.appendChild(createTextButton(WebInspector.UIString("Reset"), this._resetDeviceOrientation.bind(this), "accelerometer-reset-button"));
         return fieldsetElement;
     },
 
     /**
      * @param {!WebInspector.DeviceOrientation} deviceOrientation
      */
     _setBoxOrientation: function(deviceOrientation)
     {
-        var matrix = new WebKitCSSMatrix();
-        this._boxMatrix = matrix.rotate(90-deviceOrientation.beta, deviceOrientation.gamma, -deviceOrientation.alpha);
+        var matrix = this._viewportPreviewMatrix(true);
+        this._boxMatrix = matrix.rotate(-deviceOrientation.beta, deviceOrientation.gamma, -deviceOrientation.alpha);
+
         this._boxElement.classList.add("is-animating");
-        this._boxElement.style.webkitTransform = this._boxMatrix.toString();
+        this._boxElement.style.transform = this._boxMatrix.toString();
     },
 
     /**
+     * @param {boolean=} toViewportPreview
+     * @return {!CSSMatrix}
+     */
+    _viewportPreviewMatrix: function(toViewportPreview)
+    {
+        // The default orientation [0, 0, 0] represents a device with
+        // screen facing up. This transformation shifts the
+        // orientation displayed in the 3D preview to be front-facing
+        // instead of top-down.
+        var betaRotate = toViewportPreview ? 90 : -90;
+        var matrix = new WebKitCSSMatrix();
+        return matrix.rotate(betaRotate, 0, 0);
+    },
+
+    /**
      * @param {!MouseEvent} event
      * @return {boolean}
      */
     _onBoxDrag: function(event)
     {
         var mouseMoveVector = this._calculateRadiusVector(event.x, event.y);
         if (!mouseMoveVector)
             return true;
 
         event.consume(true);
         var axis, angle;
         if (event.shiftKey) {
-            axis = new WebInspector.Geometry.Vector(0, 0, 1);
+            axis = new WebInspector.Geometry.Vector(0, 0, -1);
             angle = (this._mouseDownVector.x - mouseMoveVector.x)*WebInspector.SensorsView.ShiftDragOrientationSpeed;
         } else {
             axis = WebInspector.Geometry.crossProduct(this._mouseDownVector, mouseMoveVector);
             axis.normalize();
             angle = WebInspector.Geometry.calculateAngle(this._mouseDownVector, mouseMoveVector);
         }
         var matrix = new WebKitCSSMatrix();
         var rotationMatrix = matrix.rotateAxisAngle(axis.x, axis.y, axis.z, angle);
-        this._currentMatrix = rotationMatrix.multiply(this._boxMatrix);
+        var transformFromScreen = this._viewportPreviewMatrix();
 
-        var mat90 = new WebKitCSSMatrix();
-        mat90.rotate(90);
-        this._boxElement.style.webkitTransform = mat90.multiply(this._currentMatrix);
-        var eulerAngles = WebInspector.Geometry.EulerAngles.fromRotationMatrix(this._currentMatrix);
+        this._boxMatrix = rotationMatrix.multiply(this._originalBoxMatrix);
+        this._boxElement.style.transform = this._boxMatrix.toString();
+
+        var currentMatrix = transformFromScreen.multiply(this._boxMatrix);
+        var eulerAngles = WebInspector.Geometry.EulerAngles.fromRotationMatrix(currentMatrix);
         var newOrientation = new WebInspector.DeviceOrientation(-eulerAngles.alpha, -eulerAngles.beta, eulerAngles.gamma);
         this._setDeviceOrientation(newOrientation, WebInspector.SensorsView.DeviceOrientationModificationSource.UserDrag);
         this._setSelectElementLabel(this._orientationSelectElement, WebInspector.SensorsView.NonPresetOptions.Custom);
         return false;
     },
 
     /**
      * @param {!MouseEvent} event
      * @return {boolean}
      */
     _onBoxDragStart: function(event)
     {
         if (!this._deviceOrientationOverrideEnabled)
             return false;
 
         this._mouseDownVector = this._calculateRadiusVector(event.x, event.y);
+        this._originalBoxMatrix = this._boxMatrix;
 
         if (!this._mouseDownVector)
             return false;
 
         event.consume(true);
         return true;
     },
 
-    _onBoxDragEnd: function()
-    {
-        this._boxMatrix = this._currentMatrix;
-    },
-
     /**
      * @param {number} x
      * @param {number} y
      * @return {?WebInspector.Geometry.Vector}
      */
     _calculateRadiusVector: function(x, y)
     {
         var rect = this._stageElement.getBoundingClientRect();
         var radius = Math.max(rect.width, rect.height) / 2;
         var sphereX = (x - rect.left - rect.width / 2) / radius;
@@ skipping 64 matching lines @@
         ]
     }
 ]
 
 /** @type {!Array.<{title: string, value: !Array.<{title: string, orientation: !WebInspector.DeviceOrientation}>}>} */
 WebInspector.SensorsView.PresetOrientations = [
     {
         title: "Presets",
         value: [
             {title: WebInspector.UIString("Portrait"), orientation: "[0, 90, 0]"},
-            {title: WebInspector.UIString("Portrait upside down"), orientation: "[180, 90, 0]"},
-            {title: WebInspector.UIString("Landscape left"), orientation: "[90, 90, 0]"},
-            {title: WebInspector.UIString("Landscape right"), orientation: "[270, 90, 0]"},
+            {title: WebInspector.UIString("Portrait upside down"), orientation: "[180, -90, 0]"},
+            {title: WebInspector.UIString("Landscape left"), orientation: "[0, 90, -90]"},
+            {title: WebInspector.UIString("Landscape right"), orientation: "[0, 90, 90]"},
             {title: WebInspector.UIString("Display up"), orientation: "[0, 0, 0]"},
             {title: WebInspector.UIString("Display down"), orientation: "[0, 180, 0]"}
         ]
     }
 ]
 
 /**
  * @return {!WebInspector.SensorsView}
  */
 WebInspector.SensorsView.instance = function()
@@ skipping 19 matching lines @@
      * @return {boolean}
      */
     handleAction: function(context, actionId)
     {
         WebInspector.inspectorView.showViewInDrawer("sensors");
         return true;
     }
 }
 
 WebInspector.SensorsView.ShiftDragOrientationSpeed = 16;