Index: Source/devtools/front_end/OverridesView.js |
diff --git a/Source/devtools/front_end/OverridesView.js b/Source/devtools/front_end/OverridesView.js |
index 6fd8e757a6b741b6ead61294742082604c318e02..63163a302953e7af64b3edad244e17c2334aaeae 100644 |
--- a/Source/devtools/front_end/OverridesView.js |
+++ b/Source/devtools/front_end/OverridesView.js |
@@ -223,6 +223,7 @@ WebInspector.OverridesView.DeviceTab = function() |
var emulateButton = buttonsBar.createChild("button", "settings-tab-text-button"); |
emulateButton.textContent = WebInspector.UIString("Emulate"); |
emulateButton.addEventListener("click", this._emulateButtonClicked.bind(this), false); |
+ this._emulateButton = emulateButton; |
var resetButton = buttonsBar.createChild("button", "settings-tab-text-button"); |
resetButton.textContent = WebInspector.UIString("Reset"); |
@@ -237,6 +238,9 @@ WebInspector.OverridesView.DeviceTab = function() |
this._userAgentValueElement = this._userAgentLabel.createChild("span", "overrides-device-value"); |
this._updateValueLabels(); |
+ |
+ WebInspector.overridesSupport.addEventListener(WebInspector.OverridesSupport.Events.CanForceCompositingModeChanged, this._canForceCompositingModeChanged, this); |
+ WebInspector.overridesSupport.updateCanForceCompositingMode(this._canForceCompositingModeChanged.bind(this)); |
} |
// Third element lists device metrics separated by 'x': |
@@ -368,7 +372,7 @@ WebInspector.OverridesView.DeviceTab._tablets = [ |
"1280x800x1x0x1"], |
["Samsung Galaxy Tab", |
"Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1", |
- "1024x600x0x1"], |
+ "1024x600x1x0x1"], |
]; |
WebInspector.OverridesView.DeviceTab.prototype = { |
@@ -383,6 +387,8 @@ WebInspector.OverridesView.DeviceTab.prototype = { |
_emulateButtonClicked: function() |
{ |
+ if (!WebInspector.overridesSupport.canForceCompositingMode()) |
+ return; |
var option = this._deviceSelectElement.options[this._deviceSelectElement.selectedIndex]; |
WebInspector.overridesSupport.emulateDevice(option._metrics, option._userAgent); |
}, |
@@ -392,6 +398,11 @@ WebInspector.OverridesView.DeviceTab.prototype = { |
WebInspector.overridesSupport.reset(); |
}, |
+ _canForceCompositingModeChanged: function() |
+ { |
+ this._emulateButton.disabled = !WebInspector.overridesSupport.canForceCompositingMode(); |
+ }, |
+ |
_deviceSelected: function() |
{ |
var option = this._deviceSelectElement.options[this._deviceSelectElement.selectedIndex]; |
@@ -426,6 +437,7 @@ WebInspector.OverridesView.ViewportTab = function() |
const metricsSetting = WebInspector.settings.deviceMetrics.get(); |
var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(metricsSetting); |
var checkbox = this._createSettingCheckbox(WebInspector.UIString("Emulate viewport"), WebInspector.settings.overrideDeviceMetrics, this._onMetricsCheckboxClicked.bind(this)); |
+ this._overrideDeviceMetricsCheckbox = checkbox.querySelector("input"); |
WebInspector.settings.deviceMetrics.addChangeListener(this._updateDeviceMetricsElement, this); |
this.element.appendChild(checkbox); |
@@ -433,6 +445,8 @@ WebInspector.OverridesView.ViewportTab = function() |
this.element.appendChild(this._createMediaEmulationElement()); |
this._onMetricsCheckboxClicked(WebInspector.settings.overrideDeviceMetrics.get()); |
+ WebInspector.overridesSupport.addEventListener(WebInspector.OverridesSupport.Events.CanForceCompositingModeChanged, this._canForceCompositingModeChanged, this); |
+ WebInspector.overridesSupport.updateCanForceCompositingMode(this._canForceCompositingModeChanged.bind(this)); |
} |
WebInspector.OverridesView.ViewportTab.prototype = { |
@@ -494,6 +508,7 @@ WebInspector.OverridesView.ViewportTab.prototype = { |
_createDeviceMetricsElement: function(metrics) |
{ |
var fieldsetElement = WebInspector.SettingsTab.createSettingFieldset(WebInspector.settings.overrideDeviceMetrics); |
+ this._overrideDeviceMetricsFieldset = fieldsetElement; |
fieldsetElement.id = "metrics-override-section"; |
function swapDimensionsClicked(event) |
@@ -557,6 +572,12 @@ WebInspector.OverridesView.ViewportTab.prototype = { |
this._textAutosizingOverrideCheckbox.checked = metrics.textAutosizing; |
}, |
+ _canForceCompositingModeChanged: function() |
+ { |
+ this._overrideDeviceMetricsFieldset.disabled = !WebInspector.overridesSupport.canForceCompositingMode(); |
+ this._overrideDeviceMetricsCheckbox.disabled = !WebInspector.overridesSupport.canForceCompositingMode(); |
+ }, |
+ |
_createMediaEmulationElement: function() |
{ |
var checkbox = WebInspector.SettingsTab.createSettingCheckbox(WebInspector.UIString("CSS media"), WebInspector.settings.overrideCSSMedia, true); |