Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: Source/devtools/front_end/OverridesView.js

Issue 50043007: DevTools: check for canForceCompositingMode before trying to emulate device metrics. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36", 361 "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36",
362 "1280x800x1.325x0x1"], 362 "1280x800x1.325x0x1"],
363 ["Motorola Xoom, Xyboard", 363 ["Motorola Xoom, Xyboard",
364 "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/5 25.10 (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2", 364 "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/5 25.10 (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2",
365 "1280x800x1x0x1"], 365 "1280x800x1x0x1"],
366 ["Samsung Galaxy Tab 7.7, 8.9, 10.1", 366 ["Samsung Galaxy Tab 7.7, 8.9, 10.1",
367 "Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebK it/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1", 367 "Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebK it/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
368 "1280x800x1x0x1"], 368 "1280x800x1x0x1"],
369 ["Samsung Galaxy Tab", 369 ["Samsung Galaxy Tab",
370 "Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebK it/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1", 370 "Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebK it/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
371 "1024x600x0x1"], 371 "1024x600x1x0x1"],
372 ]; 372 ];
373 373
374 WebInspector.OverridesView.DeviceTab.prototype = { 374 WebInspector.OverridesView.DeviceTab.prototype = {
375 /** 375 /**
376 * @param {Event} e 376 * @param {Event} e
377 */ 377 */
378 _keyPressed: function(e) 378 _keyPressed: function(e)
379 { 379 {
380 if (e.keyCode === WebInspector.KeyboardShortcut.Keys.Enter.code) 380 if (e.keyCode === WebInspector.KeyboardShortcut.Keys.Enter.code)
381 this._emulateButtonClicked(); 381 this._emulateButtonClicked();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 * @extends {WebInspector.OverridesView.Tab} 419 * @extends {WebInspector.OverridesView.Tab}
420 */ 420 */
421 WebInspector.OverridesView.ViewportTab = function() 421 WebInspector.OverridesView.ViewportTab = function()
422 { 422 {
423 WebInspector.OverridesView.Tab.call(this, "viewport", WebInspector.UIString( "Viewport"), [WebInspector.settings.overrideDeviceMetrics, WebInspector.settings .overrideCSSMedia]); 423 WebInspector.OverridesView.Tab.call(this, "viewport", WebInspector.UIString( "Viewport"), [WebInspector.settings.overrideDeviceMetrics, WebInspector.settings .overrideCSSMedia]);
424 this.element.addStyleClass("overrides-viewport"); 424 this.element.addStyleClass("overrides-viewport");
425 425
426 const metricsSetting = WebInspector.settings.deviceMetrics.get(); 426 const metricsSetting = WebInspector.settings.deviceMetrics.get();
427 var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(metri csSetting); 427 var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(metri csSetting);
428 var checkbox = this._createSettingCheckbox(WebInspector.UIString("Emulate vi ewport"), WebInspector.settings.overrideDeviceMetrics, this._onMetricsCheckboxCl icked.bind(this)); 428 var checkbox = this._createSettingCheckbox(WebInspector.UIString("Emulate vi ewport"), WebInspector.settings.overrideDeviceMetrics, this._onMetricsCheckboxCl icked.bind(this));
429 this._overrideDeviceMetricsCheckbox = checkbox.querySelector("input");
429 WebInspector.settings.deviceMetrics.addChangeListener(this._updateDeviceMetr icsElement, this); 430 WebInspector.settings.deviceMetrics.addChangeListener(this._updateDeviceMetr icsElement, this);
430 431
431 this.element.appendChild(checkbox); 432 this.element.appendChild(checkbox);
432 this.element.appendChild(this._createDeviceMetricsElement(metrics)); 433 this.element.appendChild(this._createDeviceMetricsElement(metrics));
433 this.element.appendChild(this._createMediaEmulationElement()); 434 this.element.appendChild(this._createMediaEmulationElement());
434 this._onMetricsCheckboxClicked(WebInspector.settings.overrideDeviceMetrics.g et()); 435 this._onMetricsCheckboxClicked(WebInspector.settings.overrideDeviceMetrics.g et());
435 436
437 WebInspector.overridesSupport.addEventListener(WebInspector.OverridesSupport .Events.CanForceCompositingModeChanged, this._canForceCompositingModeChanged, th is);
438 WebInspector.overridesSupport.updateCanForceCompositingMode(this._canForceCo mpositingModeChanged.bind(this));
436 } 439 }
437 440
438 WebInspector.OverridesView.ViewportTab.prototype = { 441 WebInspector.OverridesView.ViewportTab.prototype = {
439 /** 442 /**
440 * @param {boolean} enabled 443 * @param {boolean} enabled
441 */ 444 */
442 _onMetricsCheckboxClicked: function(enabled) 445 _onMetricsCheckboxClicked: function(enabled)
443 { 446 {
444 if (enabled && !this._widthOverrideElement.value) 447 if (enabled && !this._widthOverrideElement.value)
445 this._widthOverrideElement.focus(); 448 this._widthOverrideElement.focus();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 WebInspector.settings.deviceMetrics.set(value); 490 WebInspector.settings.deviceMetrics.set(value);
488 } 491 }
489 }, 492 },
490 493
491 /** 494 /**
492 * @param {WebInspector.OverridesSupport.DeviceMetrics} metrics 495 * @param {WebInspector.OverridesSupport.DeviceMetrics} metrics
493 */ 496 */
494 _createDeviceMetricsElement: function(metrics) 497 _createDeviceMetricsElement: function(metrics)
495 { 498 {
496 var fieldsetElement = WebInspector.SettingsTab.createSettingFieldset(Web Inspector.settings.overrideDeviceMetrics); 499 var fieldsetElement = WebInspector.SettingsTab.createSettingFieldset(Web Inspector.settings.overrideDeviceMetrics);
500 this._overrideDeviceMetricsFieldset = fieldsetElement;
497 fieldsetElement.id = "metrics-override-section"; 501 fieldsetElement.id = "metrics-override-section";
498 502
499 function swapDimensionsClicked(event) 503 function swapDimensionsClicked(event)
500 { 504 {
501 var widthValue = this._widthOverrideElement.value; 505 var widthValue = this._widthOverrideElement.value;
502 this._widthOverrideElement.value = this._heightOverrideElement.value ; 506 this._widthOverrideElement.value = this._heightOverrideElement.value ;
503 this._heightOverrideElement.value = widthValue; 507 this._heightOverrideElement.value = widthValue;
504 this._applyDeviceMetricsUserInput(); 508 this._applyDeviceMetricsUserInput();
505 } 509 }
506 510
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 if (this._heightOverrideElement.value !== metrics.height) 554 if (this._heightOverrideElement.value !== metrics.height)
551 this._heightOverrideElement.value = metrics.height; 555 this._heightOverrideElement.value = metrics.height;
552 if (this._deviceScaleFactorOverrideElement.value !== metrics.deviceScale Factor) 556 if (this._deviceScaleFactorOverrideElement.value !== metrics.deviceScale Factor)
553 this._deviceScaleFactorOverrideElement.value = metrics.deviceScaleFa ctor; 557 this._deviceScaleFactorOverrideElement.value = metrics.deviceScaleFa ctor;
554 if (this._fontScaleFactorOverrideElement.value !== metrics.fontScaleFact or) 558 if (this._fontScaleFactorOverrideElement.value !== metrics.fontScaleFact or)
555 this._fontScaleFactorOverrideElement.value = metrics.fontScaleFactor ; 559 this._fontScaleFactorOverrideElement.value = metrics.fontScaleFactor ;
556 if (this._textAutosizingOverrideCheckbox.checked !== metrics.textAutosiz ing) 560 if (this._textAutosizingOverrideCheckbox.checked !== metrics.textAutosiz ing)
557 this._textAutosizingOverrideCheckbox.checked = metrics.textAutosizin g; 561 this._textAutosizingOverrideCheckbox.checked = metrics.textAutosizin g;
558 }, 562 },
559 563
564 _canForceCompositingModeChanged: function()
565 {
566 this._overrideDeviceMetricsFieldset.disabled = !WebInspector.overridesSu pport.canForceCompositingMode();
567 this._overrideDeviceMetricsCheckbox.disabled = !WebInspector.overridesSu pport.canForceCompositingMode();
568 },
569
560 _createMediaEmulationElement: function() 570 _createMediaEmulationElement: function()
561 { 571 {
562 var checkbox = WebInspector.SettingsTab.createSettingCheckbox(WebInspect or.UIString("CSS media"), WebInspector.settings.overrideCSSMedia, true); 572 var checkbox = WebInspector.SettingsTab.createSettingCheckbox(WebInspect or.UIString("CSS media"), WebInspector.settings.overrideCSSMedia, true);
563 var fieldsetElement = WebInspector.SettingsTab.createSettingFieldset(Web Inspector.settings.overrideCSSMedia); 573 var fieldsetElement = WebInspector.SettingsTab.createSettingFieldset(Web Inspector.settings.overrideCSSMedia);
564 checkbox.appendChild(fieldsetElement); 574 checkbox.appendChild(fieldsetElement);
565 575
566 var mediaSelectElement = fieldsetElement.createChild("select"); 576 var mediaSelectElement = fieldsetElement.createChild("select");
567 var mediaTypes = WebInspector.CSSStyleModel.MediaTypes; 577 var mediaTypes = WebInspector.CSSStyleModel.MediaTypes;
568 var defaultMedia = WebInspector.settings.emulatedCSSMedia.get(); 578 var defaultMedia = WebInspector.settings.emulatedCSSMedia.get();
569 for (var i = 0; i < mediaTypes.length; ++i) { 579 for (var i = 0; i < mediaTypes.length; ++i) {
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 cellElement.appendChild(document.createTextNode(" \u03B2: ")); 896 cellElement.appendChild(document.createTextNode(" \u03B2: "));
887 this._betaElement = this._createInput(cellElement, "device-orientation-o verride-beta", String(deviceOrientation.beta), this._applyDeviceOrientationUserI nput.bind(this), true); 897 this._betaElement = this._createInput(cellElement, "device-orientation-o verride-beta", String(deviceOrientation.beta), this._applyDeviceOrientationUserI nput.bind(this), true);
888 cellElement.appendChild(document.createTextNode(" \u03B3: ")); 898 cellElement.appendChild(document.createTextNode(" \u03B3: "));
889 this._gammaElement = this._createInput(cellElement, "device-orientation- override-gamma", String(deviceOrientation.gamma), this._applyDeviceOrientationUs erInput.bind(this), true); 899 this._gammaElement = this._createInput(cellElement, "device-orientation- override-gamma", String(deviceOrientation.gamma), this._applyDeviceOrientationUs erInput.bind(this), true);
890 900
891 return fieldsetElement; 901 return fieldsetElement;
892 } 902 }
893 } 903 }
894 904
895 WebInspector.OverridesView.SensorsTab.prototype.__proto__ = WebInspector.Overrid esView.Tab.prototype; 905 WebInspector.OverridesView.SensorsTab.prototype.__proto__ = WebInspector.Overrid esView.Tab.prototype;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698