Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / OverridesView.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/OverridesView.js b/src/third_party/WebKit/Source/devtools/front_end/OverridesView.js
index ad3de23..a4a39c5 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/OverridesView.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/OverridesView.js
@@ -231,7 +231,6 @@ WebInspector.OverridesView.DeviceTab = function()
         this._deviceSelectElement.selectedIndex = devices.length - 1;
 
     this._deviceSelectElement.addEventListener("change", this._deviceSelected.bind(this), false);
-    this._deviceSelectElement.addEventListener("dblclick", this._emulateButtonClicked.bind(this), false);
     this._deviceSelectElement.addEventListener("keypress", this._keyPressed.bind(this), false);
     this._deviceSelectElement.disabled = WebInspector.isInspectingDevice();
 
@@ -240,11 +239,11 @@ WebInspector.OverridesView.DeviceTab = function()
     emulateButton.textContent = WebInspector.UIString("Emulate");
     emulateButton.addEventListener("click", this._emulateButtonClicked.bind(this), false);
     emulateButton.disabled = WebInspector.isInspectingDevice();
-    this._emulateButton = emulateButton;
 
     var resetButton = buttonsBar.createChild("button", "settings-tab-text-button");
     resetButton.textContent = WebInspector.UIString("Reset");
     resetButton.addEventListener("click", this._resetButtonClicked.bind(this), false);
+    this._resetButton = resetButton;
 
     this._viewportValueLabel = this.element.createChild("div", "overrides-device-value-label");
     this._viewportValueLabel.textContent = WebInspector.UIString("Viewport:");
@@ -255,6 +254,8 @@ WebInspector.OverridesView.DeviceTab = function()
     this._userAgentValueElement = this._userAgentLabel.createChild("span", "overrides-device-value");
 
     this._updateValueLabels();
+    WebInspector.overridesSupport.addEventListener(WebInspector.OverridesSupport.Events.HasActiveOverridesChanged, this._hasActiveOverridesChanged, this);
+    this._hasActiveOverridesChanged();
 }
 
 // Third element lists device metrics separated by 'x':
@@ -412,6 +413,11 @@ WebInspector.OverridesView.DeviceTab.prototype = {
         WebInspector.overridesSupport.reset();
     },
 
+    _hasActiveOverridesChanged: function()
+    {
+        this._resetButton.disabled = !WebInspector.overridesSupport.hasActiveOverrides();
+    },
+
     _deviceSelected: function()
     {
         var option = this._deviceSelectElement.options[this._deviceSelectElement.selectedIndex];
@@ -451,7 +457,7 @@ WebInspector.OverridesView.ViewportTab = function()
 
     this.element.appendChild(checkbox);
     this.element.appendChild(this._createDeviceMetricsElement(metrics));
-    this.element.appendChild(this._createMediaEmulationElement());
+    this.element.appendChild(this._createMediaEmulationFragment());
 
     var footnote = this.element.createChild("p", "help-footnote");
     var footnoteLink = footnote.createChild("a");
@@ -567,6 +573,7 @@ WebInspector.OverridesView.ViewportTab.prototype = {
         this._widthRangeInput.min = 100;
         this._widthRangeInput.max = 2000;
         this._widthRangeInput.addEventListener("change", this._rangeValueChanged.bind(this), false);
+        this._widthRangeInput.addEventListener("input", this._rangeValueChanged.bind(this), false);
         this._widthRangeInput.value = this._widthOverrideElement.value;
 
         rowElement = tableElement.createChild("tr");
@@ -610,13 +617,12 @@ WebInspector.OverridesView.ViewportTab.prototype = {
             this._textAutosizingOverrideCheckbox.checked = metrics.textAutosizing || false;
     },
 
-    _createMediaEmulationElement: function()
+    _createMediaEmulationFragment: function()
     {
         var checkbox = WebInspector.SettingsUI.createSettingCheckbox(WebInspector.UIString("CSS media"), WebInspector.settings.overrideCSSMedia, true);
         var fieldsetElement = WebInspector.SettingsUI.createSettingFieldset(WebInspector.settings.overrideCSSMedia);
         if (WebInspector.isInspectingDevice())
             fieldsetElement.disabled = true;
-        checkbox.appendChild(fieldsetElement);
 
         var mediaSelectElement = fieldsetElement.createChild("select");
         var mediaTypes = WebInspector.CSSStyleModel.MediaTypes;
@@ -636,7 +642,10 @@ WebInspector.OverridesView.ViewportTab.prototype = {
         }
 
         mediaSelectElement.addEventListener("change", this._emulateMediaChanged.bind(this, mediaSelectElement), false);
-        return checkbox;
+        var fragment = document.createDocumentFragment();
+        fragment.appendChild(checkbox);
+        fragment.appendChild(fieldsetElement);
+        return fragment;
     },
 
     _emulateMediaChanged: function(select)
@@ -1009,7 +1018,7 @@ WebInspector.OverridesView.SensorsTab.prototype = {
     _setBoxOrientation: function(deviceOrientation)
     {
         var matrix = new WebKitCSSMatrix();
-        this._boxMatrix = matrix.rotate(deviceOrientation.beta, deviceOrientation.gamma, deviceOrientation.alpha);
+        this._boxMatrix = matrix.rotate(-deviceOrientation.beta, deviceOrientation.gamma, -deviceOrientation.alpha);
         this._boxElement.style.webkitTransform = this._boxMatrix.toString();
     },
 
@@ -1032,7 +1041,7 @@ WebInspector.OverridesView.SensorsTab.prototype = {
         this._currentMatrix = rotationMatrix.multiply(this._boxMatrix)
         this._boxElement.style.webkitTransform = this._currentMatrix;
         var eulerAngles = WebInspector.Geometry.EulerAngles.fromRotationMatrix(this._currentMatrix);
-        var newOrientation = new WebInspector.OverridesSupport.DeviceOrientation(eulerAngles.alpha, eulerAngles.beta, eulerAngles.gamma);
+        var newOrientation = new WebInspector.OverridesSupport.DeviceOrientation(-eulerAngles.alpha, -eulerAngles.beta, eulerAngles.gamma);
         this._setDeviceOrientation(newOrientation, WebInspector.OverridesView.SensorsTab.DeviceOrientationModificationSource.UserDrag);
         return false;
     },