[DevTools] Show device screen size in DIPs.

BUG=327641

Review URL: https://codereview.chromium.org/212103004

git-svn-id: svn://svn.chromium.org/blink/trunk@170587 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/inspector/device-emulation/device-emulation-test.js

@@ -179,8 +179,6 @@ InspectorTest.getPageMetrics = function(callback)
 
 InspectorTest.applyEmulationAndReload = function(width, height, deviceScaleFactor, viewport, callback)
 {
-    width *= deviceScaleFactor;
-    height *= deviceScaleFactor;
     InspectorTest.addSniffer(WebInspector.overridesSupport, "_deviceMetricsOverrideAppliedForTest", emulateCallback);
     WebInspector.overridesSupport.emulateDevice(width + "x" + height + "x" + deviceScaleFactor + "x0x0", "");
 

third_party/WebKit/Source/devtools/front_end/OverridesSupport.js

@@ -461,8 +461,8 @@ WebInspector.OverridesSupport.prototype = {
         if (!metrics.isValid())
             return;
 
-        var dipWidth = Math.round(metrics.width / metrics.deviceScaleFactor);
-        var dipHeight = Math.round(metrics.height / metrics.deviceScaleFactor);
+        var dipWidth = Math.round(metrics.width);
+        var dipHeight = Math.round(metrics.height);
         var metricsOverrideEnabled = !!(dipWidth && dipHeight);
 
         // Disable override without checks.

third_party/WebKit/Source/devtools/front_end/OverridesView.js

@@ -269,49 +269,49 @@ WebInspector.OverridesView.DeviceTab._phones = [
      "320x480x1"],
     ["Apple iPhone 4",
      "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5",
-     "640x960x2"],
+     "320x480x2"],
     ["Apple iPhone 5",
      "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
-     "640x1136x2"],
+     "320x568x2"],
     ["BlackBerry Z10",
      "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile Safari/537.10+",
-     "768x1280x2"],
+     "384x640x2"],
     ["BlackBerry Z30",
      "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile Safari/537.10+",
-     "720x1280x2"],
+     "360x640x2"],
     ["Google Nexus 4",
      "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 4 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
-     "768x1280x2"],
+     "384x640x2"],
     ["Google Nexus 5",
      "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
-     "1080x1920x3"],
+     "360x640x3"],
     ["Google Nexus S",
      "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Nexus S Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "480x800x1.5"],
+     "320x533x1.5"],
     ["HTC Evo, Touch HD, Desire HD, Desire",
      "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "480x800x1.5"],
+     "320x533x1.5"],
     ["HTC One X, EVO LTE",
      "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",
-     "720x1280x2"],
+     "360x640x2"],
     ["HTC Sensation, Evo 3D",
      "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; HTC Sensation Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-     "540x960x1.5"],
+     "360x640x1.5"],
     ["LG Optimus 2X, Optimus 3D, Optimus Black",
      "Mozilla/5.0 (Linux; U; Android 2.2; en-us; LG-P990/V08c Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 MMS/LG-Android-MMS-V1.0/1.2",
-     "480x800x1.5"],
+     "320x533x1.5"],
     ["LG Optimus G",
      "Mozilla/5.0 (Linux; Android 4.0; LG-E975 Build/IMM76L) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
-     "768x1280x2"],
+     "384x640x2"],
     ["LG Optimus LTE, Optimus 4X HD",
      "Mozilla/5.0 (Linux; U; Android 2.3; en-us; LG-P930 Build/GRJ90) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "720x1280x1.7"],
+     "424x753x1.7"],
     ["LG Optimus One",
      "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; LG-MS690 Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "320x480x1.5"],
+     "213x320x1.5"],
     ["Motorola Defy, Droid, Droid X, Milestone",
      "Mozilla/5.0 (Linux; U; Android 2.0; en-us; Milestone Build/ SHOLS_U2_01.03.1) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17",
-     "480x854x1.5"],
+     "320x569x1.5"],
     ["Motorola Droid 3, Droid 4, Droid Razr, Atrix 4G, Atrix 2",
      "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Droid Build/FRG22D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
      "540x960x1"],
@@ -323,43 +323,43 @@ WebInspector.OverridesView.DeviceTab._phones = [
      "360x640x1"],
     ["Nokia Lumia 7X0, Lumia 8XX, Lumia 900, N800, N810, N900",
      "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 820)",
-     "480x800x1.5"],
+     "320x533x1.5"],
     ["Samsung Galaxy Note 3",
      "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-     "1080x1920x2"],
+     "540x960x2"],
     ["Samsung Galaxy Note II",
      "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-     "720x1280x2"],
+     "360x640x2"],
     ["Samsung Galaxy Note",
      "Mozilla/5.0 (Linux; U; Android 2.3; en-us; SAMSUNG-SGH-I717 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "800x1280x2"],
+     "400x640x2"],
     ["Samsung Galaxy S III, Galaxy Nexus",
      "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-     "720x1280x2"],
+     "360x640x2"],
     ["Samsung Galaxy S, S II, W",
      "Mozilla/5.0 (Linux; U; Android 2.1; en-us; GT-I9000 Build/ECLAIR) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2",
-     "480x800x1.5"],
+     "320x533x1.5"],
     ["Samsung Galaxy S4",
      "Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36",
-     "1080x1920x3"],
+     "360x640x3"],
     ["Sony Xperia S, Ion",
      "Mozilla/5.0 (Linux; U; Android 4.0; en-us; LT28at Build/6.1.C.1.111) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-     "720x1280x2"],
+     "360x640x2"],
     ["Sony Xperia Sola, U",
      "Mozilla/5.0 (Linux; U; Android 2.3; en-us; SonyEricssonST25i Build/6.0.B.1.564) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
      "480x854x1"],
     ["Sony Xperia Z, Z1",
      "Mozilla/5.0 (Linux; U; Android 4.2; en-us; SonyC6903 Build/14.1.G.1.518) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-     "1080x1920x3"],
+     "360x640x3"],
 ];
 
 WebInspector.OverridesView.DeviceTab._tablets = [
     ["Amazon Amazon Kindle Fire HD 7\u2033",
      "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire HD Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "1280x800x1.5"],
+     "853x533x1.5"],
     ["Amazon Amazon Kindle Fire HD 8.9\u2033",
      "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire HD Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-     "1920x1200x1.5"],
+     "1280x800x1.5"],
     ["Amazon Amazon Kindle Fire",
      "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
      "1024x600x1"],
@@ -368,19 +368,19 @@ WebInspector.OverridesView.DeviceTab._tablets = [
      "1024x768x1"],
     ["Apple iPad 3 / 4",
      "Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
-     "2048x1536x2"],
+     "1024x768x2"],
     ["BlackBerry PlayBook",
      "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+",
      "1024x600x1"],
     ["Google Nexus 10",
      "Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36",
-     "2560x1600x2"],
+     "1280x800x2"],
     ["Google Nexus 7 2",
      "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",
-     "1920x1200x2"],
+     "960x600x2"],
     ["Google Nexus 7",
      "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",
-     "1280x800x1.325"],
+     "966x604x1.325"],
     ["Motorola Xoom, Xyboard",
      "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/525.10 (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2",
      "1280x800x1"],

third_party/WebKit/Source/devtools/front_end/Settings.js

@@ -484,7 +484,7 @@ WebInspector.VersionController = function()
 {
 }
 
-WebInspector.VersionController.currentVersion = 7;
+WebInspector.VersionController.currentVersion = 8;
 
 WebInspector.VersionController.prototype = {
     updateVersion: function()
@@ -647,6 +647,30 @@ WebInspector.VersionController.prototype = {
         }
     },
 
+    _updateVersionFrom7To8: function()
+    {
+        var settingName = "deviceMetrics";
+        if (!window.localStorage || !(settingName in window.localStorage))
+            return;
+        var setting = WebInspector.settings.createSetting(settingName, undefined);
+        var value = setting.get();
+        if (!value)
+            return;
+
+        var components = value.split("x");
+        if (components.length >= 3) {
+            var width = parseInt(components[0], 10);
+            var height = parseInt(components[1], 10);
+            var deviceScaleFactor = parseFloat(components[2]);
+            if (deviceScaleFactor) {
+                components[0] = "" + Math.round(width / deviceScaleFactor);
+                components[1] = "" + Math.round(height / deviceScaleFactor);
+            }
+        }
+        value = components.join("x");
+        setting.set(value);
+    },
+
     /**
      * @param {!WebInspector.Setting} breakpointsSetting
      * @param {number} maxBreakpointsCount