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

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

Issue 45363004: DevTools: explicitly control support for viewport meta tag so that desktop emulation was possible (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review comments addressed. 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 | Annotate | Revision Log
« no previous file with comments | « Source/devtools/front_end/OverridesSupport.js ('k') | Source/devtools/front_end/Settings.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 var element = parentElement.createChild("input"); 131 var element = parentElement.createChild("input");
132 element.id = id; 132 element.id = id;
133 element.type = "text"; 133 element.type = "text";
134 element.maxLength = 12; 134 element.maxLength = 12;
135 element.style.width = "80px"; 135 element.style.width = "80px";
136 element.value = defaultText; 136 element.value = defaultText;
137 element.align = "right"; 137 element.align = "right";
138 if (numeric) 138 if (numeric)
139 element.className = "numeric"; 139 element.className = "numeric";
140 element.addEventListener("blur", eventListener, false); 140 element.addEventListener("blur", eventListener, false);
141 element.addEventListener("keydown", keyDownListener, false);
142 function keyDownListener(event)
143 {
144 if (isEnterKey(event))
145 eventListener(event);
146 }
141 return element; 147 return element;
142 }, 148 },
143 149
144 /** 150 /**
145 * @param {string} title 151 * @param {string} title
146 * @param {function(boolean)} callback 152 * @param {function(boolean)} callback
147 */ 153 */
148 _createNonPersistedCheckbox: function(title, callback) 154 _createNonPersistedCheckbox: function(title, callback)
149 { 155 {
150 var labelElement = document.createElement("label"); 156 var labelElement = document.createElement("label");
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 "640x1136x2x1x1"], 275 "640x1136x2x1x1"],
270 ["BlackBerry Z10", 276 ["BlackBerry Z10",
271 "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/ 10.0.9.2372 Mobile Safari/537.10+", 277 "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/ 10.0.9.2372 Mobile Safari/537.10+",
272 "768x1280x2x1x1"], 278 "768x1280x2x1x1"],
273 ["BlackBerry Z30", 279 ["BlackBerry Z30",
274 "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/ 10.0.9.2372 Mobile Safari/537.10+", 280 "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/ 10.0.9.2372 Mobile Safari/537.10+",
275 "720x1280x2x1x1"], 281 "720x1280x2x1x1"],
276 ["Google Nexus 4", 282 ["Google Nexus 4",
277 "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 4 Build/JOP40D) AppleWebKi t/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19", 283 "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 4 Build/JOP40D) AppleWebKi t/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
278 "768x1280x2x0x1"], 284 "768x1280x2x0x1"],
285 ["Google Nexus 5",
286 "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKi t/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
287 "1080x1920x3x0x1"],
279 ["Google Nexus S", 288 ["Google Nexus S",
280 "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Nexus S Build/GRJ22) AppleWeb Kit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1", 289 "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Nexus S Build/GRJ22) AppleWeb Kit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
281 "480x800x1.5x0x1"], 290 "480x800x1.5x0x1"],
282 ["HTC Evo, Touch HD, Desire HD, Desire", 291 ["HTC Evo, Touch HD, Desire HD, Desire",
283 "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) A ppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1", 292 "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) A ppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
284 "480x800x1.5x0x1"], 293 "480x800x1.5x0x1"],
285 ["HTC One X, EVO LTE", 294 ["HTC One X, EVO LTE",
286 "Mozilla/5.0 (Linux; Android 4.0.3; HTC One X Build/IML74K) AppleWebKit/535 .19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19", 295 "Mozilla/5.0 (Linux; Android 4.0.3; HTC One X Build/IML74K) AppleWebKit/535 .19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
287 "720x1280x2x0x1"], 296 "720x1280x2x0x1"],
288 ["HTC Sensation, Evo 3D", 297 ["HTC Sensation, Evo 3D",
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 434
426 WebInspector.OverridesView.DeviceTab.prototype.__proto__ = WebInspector.Override sView.Tab.prototype; 435 WebInspector.OverridesView.DeviceTab.prototype.__proto__ = WebInspector.Override sView.Tab.prototype;
427 436
428 437
429 /** 438 /**
430 * @constructor 439 * @constructor
431 * @extends {WebInspector.OverridesView.Tab} 440 * @extends {WebInspector.OverridesView.Tab}
432 */ 441 */
433 WebInspector.OverridesView.ViewportTab = function() 442 WebInspector.OverridesView.ViewportTab = function()
434 { 443 {
435 WebInspector.OverridesView.Tab.call(this, "viewport", WebInspector.UIString( "Viewport"), [WebInspector.settings.overrideDeviceMetrics, WebInspector.settings .overrideCSSMedia]); 444 WebInspector.OverridesView.Tab.call(this, "viewport", WebInspector.UIString( "Screen"), [WebInspector.settings.overrideDeviceMetrics, WebInspector.settings.o verrideCSSMedia]);
436 this.element.addStyleClass("overrides-viewport"); 445 this.element.addStyleClass("overrides-viewport");
437 446
438 const metricsSetting = WebInspector.settings.deviceMetrics.get(); 447 const metricsSetting = WebInspector.settings.deviceMetrics.get();
439 var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(metri csSetting); 448 var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(metri csSetting);
440 var checkbox = this._createSettingCheckbox(WebInspector.UIString("Emulate vi ewport"), WebInspector.settings.overrideDeviceMetrics, this._onMetricsCheckboxCl icked.bind(this)); 449 var checkbox = this._createSettingCheckbox(WebInspector.UIString("Emulate sc reen"), WebInspector.settings.overrideDeviceMetrics, this._onMetricsCheckboxClic ked.bind(this));
441 WebInspector.settings.deviceMetrics.addChangeListener(this._updateDeviceMetr icsElement, this); 450 WebInspector.settings.deviceMetrics.addChangeListener(this._updateDeviceMetr icsElement, this);
442 451
443 this.element.appendChild(checkbox); 452 this.element.appendChild(checkbox);
444 this.element.appendChild(this._createDeviceMetricsElement(metrics)); 453 this.element.appendChild(this._createDeviceMetricsElement(metrics));
445 this.element.appendChild(this._createMediaEmulationElement()); 454 this.element.appendChild(this._createMediaEmulationElement());
446 this._onMetricsCheckboxClicked(WebInspector.settings.overrideDeviceMetrics.g et()); 455 this._onMetricsCheckboxClicked(WebInspector.settings.overrideDeviceMetrics.g et());
447 } 456 }
448 457
449 WebInspector.OverridesView.ViewportTab.prototype = { 458 WebInspector.OverridesView.ViewportTab.prototype = {
450 /** 459 /**
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 var widthValue = this._widthOverrideElement.value; 521 var widthValue = this._widthOverrideElement.value;
513 this._widthOverrideElement.value = this._heightOverrideElement.value ; 522 this._widthOverrideElement.value = this._heightOverrideElement.value ;
514 this._heightOverrideElement.value = widthValue; 523 this._heightOverrideElement.value = widthValue;
515 this._applyDeviceMetricsUserInput(); 524 this._applyDeviceMetricsUserInput();
516 } 525 }
517 526
518 var tableElement = fieldsetElement.createChild("table", "nowrap"); 527 var tableElement = fieldsetElement.createChild("table", "nowrap");
519 528
520 var rowElement = tableElement.createChild("tr"); 529 var rowElement = tableElement.createChild("tr");
521 var cellElement = rowElement.createChild("td"); 530 var cellElement = rowElement.createChild("td");
522 cellElement.appendChild(document.createTextNode(WebInspector.UIString("S creen:"))); 531 cellElement.appendChild(document.createTextNode(WebInspector.UIString("R esolution:")));
523 cellElement = rowElement.createChild("td"); 532 cellElement = rowElement.createChild("td");
524 this._widthOverrideElement = this._createInput(cellElement, "metrics-ove rride-width", String(metrics.width || screen.width), this._applyDeviceMetricsUse rInput.bind(this), true); 533 this._widthOverrideElement = this._createInput(cellElement, "metrics-ove rride-width", String(metrics.width || screen.width), this._applyDeviceMetricsUse rInput.bind(this), true);
525 this._swapDimensionsElement = cellElement.createChild("button", "overrid es-swap"); 534 this._swapDimensionsElement = cellElement.createChild("button", "overrid es-swap");
526 this._swapDimensionsElement.appendChild(document.createTextNode(" \u21C4 ")); // RIGHTWARDS ARROW OVER LEFTWARDS ARROW. 535 this._swapDimensionsElement.appendChild(document.createTextNode(" \u21C4 ")); // RIGHTWARDS ARROW OVER LEFTWARDS ARROW.
527 this._swapDimensionsElement.title = WebInspector.UIString("Swap dimensio ns"); 536 this._swapDimensionsElement.title = WebInspector.UIString("Swap dimensio ns");
528 this._swapDimensionsElement.addEventListener("click", swapDimensionsClic ked.bind(this), false); 537 this._swapDimensionsElement.addEventListener("click", swapDimensionsClic ked.bind(this), false);
538 this._swapDimensionsElement.tabIndex = -1;
529 this._heightOverrideElement = this._createInput(cellElement, "metrics-ov erride-height", String(metrics.height || screen.height), this._applyDeviceMetric sUserInput.bind(this), true); 539 this._heightOverrideElement = this._createInput(cellElement, "metrics-ov erride-height", String(metrics.height || screen.height), this._applyDeviceMetric sUserInput.bind(this), true);
530 540
531 rowElement = tableElement.createChild("tr"); 541 rowElement = tableElement.createChild("tr");
532 cellElement = rowElement.createChild("td"); 542 cellElement = rowElement.createChild("td");
533 cellElement.appendChild(document.createTextNode(WebInspector.UIString("D evice pixel ratio:"))); 543 cellElement.appendChild(document.createTextNode(WebInspector.UIString("D evice pixel ratio:")));
534 cellElement = rowElement.createChild("td"); 544 cellElement = rowElement.createChild("td");
535 this._deviceScaleFactorOverrideElement = this._createInput(cellElement, "metrics-override-device-scale", String(metrics.deviceScaleFactor || 1), this._a pplyDeviceMetricsUserInput.bind(this), true); 545 this._deviceScaleFactorOverrideElement = this._createInput(cellElement, "metrics-override-device-scale", String(metrics.deviceScaleFactor || 1), this._a pplyDeviceMetricsUserInput.bind(this), true);
536 546
537 rowElement = tableElement.createChild("tr"); 547 rowElement = tableElement.createChild("tr");
538 cellElement = rowElement.createChild("td"); 548 cellElement = rowElement.createChild("td");
539 cellElement.appendChild(document.createTextNode(WebInspector.UIString("F ont scale factor:"))); 549 cellElement.appendChild(document.createTextNode(WebInspector.UIString("F ont scale factor:")));
540 cellElement = rowElement.createChild("td"); 550 cellElement = rowElement.createChild("td");
541 this._fontScaleFactorOverrideElement = this._createInput(cellElement, "m etrics-override-font-scale", String(metrics.fontScaleFactor || 1), this._applyDe viceMetricsUserInput.bind(this), true); 551 this._fontScaleFactorOverrideElement = this._createInput(cellElement, "m etrics-override-font-scale", String(metrics.fontScaleFactor || 1), this._applyDe viceMetricsUserInput.bind(this), true);
542 552
553 var checkbox = this._createSettingCheckbox(WebInspector.UIString("Emulat e viewport"), WebInspector.settings.emulateViewport);
554 fieldsetElement.appendChild(checkbox);
555
543 var textAutosizingOverrideElement = this._createNonPersistedCheckbox(Web Inspector.UIString("Enable text autosizing"), this._applyDeviceMetricsUserInput. bind(this)); 556 var textAutosizingOverrideElement = this._createNonPersistedCheckbox(Web Inspector.UIString("Enable text autosizing"), this._applyDeviceMetricsUserInput. bind(this));
544 this._textAutosizingOverrideCheckbox = textAutosizingOverrideElement.get ElementsByTagName("input")[0]; 557 this._textAutosizingOverrideCheckbox = textAutosizingOverrideElement.get ElementsByTagName("input")[0];
545 this._textAutosizingOverrideCheckbox.checked = metrics.textAutosizing; 558 this._textAutosizingOverrideCheckbox.checked = metrics.textAutosizing;
546 fieldsetElement.appendChild(textAutosizingOverrideElement); 559 fieldsetElement.appendChild(textAutosizingOverrideElement);
547 560
548 var checkbox = this._createSettingCheckbox(WebInspector.UIString("Shrink to fit"), WebInspector.settings.deviceFitWindow); 561 checkbox = this._createSettingCheckbox(WebInspector.UIString("Shrink to fit"), WebInspector.settings.deviceFitWindow);
549 fieldsetElement.appendChild(checkbox); 562 fieldsetElement.appendChild(checkbox);
550 563
551 return fieldsetElement; 564 return fieldsetElement;
552 }, 565 },
553 566
554 _updateDeviceMetricsElement: function() 567 _updateDeviceMetricsElement: function()
555 { 568 {
556 const metricsSetting = WebInspector.settings.deviceMetrics.get(); 569 const metricsSetting = WebInspector.settings.deviceMetrics.get();
557 var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(m etricsSetting); 570 var metrics = WebInspector.OverridesSupport.DeviceMetrics.parseSetting(m etricsSetting);
558 571
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 cellElement.appendChild(document.createTextNode(" \u03B2: ")); 910 cellElement.appendChild(document.createTextNode(" \u03B2: "));
898 this._betaElement = this._createInput(cellElement, "device-orientation-o verride-beta", String(deviceOrientation.beta), this._applyDeviceOrientationUserI nput.bind(this), true); 911 this._betaElement = this._createInput(cellElement, "device-orientation-o verride-beta", String(deviceOrientation.beta), this._applyDeviceOrientationUserI nput.bind(this), true);
899 cellElement.appendChild(document.createTextNode(" \u03B3: ")); 912 cellElement.appendChild(document.createTextNode(" \u03B3: "));
900 this._gammaElement = this._createInput(cellElement, "device-orientation- override-gamma", String(deviceOrientation.gamma), this._applyDeviceOrientationUs erInput.bind(this), true); 913 this._gammaElement = this._createInput(cellElement, "device-orientation- override-gamma", String(deviceOrientation.gamma), this._applyDeviceOrientationUs erInput.bind(this), true);
901 914
902 return fieldsetElement; 915 return fieldsetElement;
903 } 916 }
904 } 917 }
905 918
906 WebInspector.OverridesView.SensorsTab.prototype.__proto__ = WebInspector.Overrid esView.Tab.prototype; 919 WebInspector.OverridesView.SensorsTab.prototype.__proto__ = WebInspector.Overrid esView.Tab.prototype;
OLDNEW
« no previous file with comments | « Source/devtools/front_end/OverridesSupport.js ('k') | Source/devtools/front_end/Settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698