Improve DPI matching & scaling logic.

remoting/webapp/unittests/client_session_unittest.js

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(function() {
+
+'use strict';
+
+module('client_session');
+
+function size(width, height) {
+  return {width: width, height: height};
+}
+
+function dpi(x, y) {
+  return {x: x, y: y};
+}
+
+test('choosePluginSize() handles same-DPI client & host',
+  function() {
+    // 1. Client & host size the same.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 2. Client logical dimensions smaller than host's.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
+
+    // 3. Client X dimension larger than hosts, Y dimension smaller.

[Jamie, 2015/02/06 23:06:02]

I think you've got this the wrong way round, which means that this test and the
previous one are basically the same (the result is limited by the x-dimension in
both cases).

[Wez, 2015/02/09 21:32:28]

Typo in description; Y & X got swapped.

[Jamie, 2015/02/09 23:52:34]

Maybe add a test for the case where it's the y-dimension that constrains the
result (and perhaps one where the aspect ratio is the same, but the sizes
differ)?

[Wez, 2015/02/13 18:59:08]

Done.
Not sure what the purpose of the latter test would be?

+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 640), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
+
+    // 4. Client dimensions larger than host's by <2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 5. Client dimensions larger than host's by >2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
+});
+
+test('choosePluginSize() handles high-DPI client, low-DPI host',
+  function() {
+    // 1. Client & host size the same.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 2. Client logical dimensions smaller than host's.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
+
+    // 3. Client X dimension larger than hosts, Y dimension smaller.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 640), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
+
+    // 4. Client logical dimensions larger than host's by <2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 900), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
+
+    // 5. Client dimensions larger than host's by >2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 1024), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
+});
+
+test('choosePluginSize() handles low-DPI client, high-DPI host',
+  function() {
+    // 1. Client & host size the same.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 2. Client logical dimensions smaller than host's.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
+
+    // 3. Client X dimension larger than hosts, Y dimension smaller.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 640), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
+
+    // 4. Client dimensions larger than host's by <2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 900), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 5. Client dimensions larger than host's by >2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 1024), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
+});
+
+test('choosePluginSize() handles high-DPI client and host',
+  function() {
+    // 1. Client & host size the same.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 2. Client logical dimensions smaller than host's.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
+
+    // 3. Client X dimension larger than hosts, Y dimension smaller.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 640), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
+
+    // 4. Client logical dimensions larger than host's by <2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 900), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
+
+    // 5. Client dimensions larger than host's by >2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 1024), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
+});
+
+test('choosePluginSize() handles high-DPI client, 150% DPI host',
+  function() {
+    // 1. Client & host size the same.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 2. Client dimensions smaller than host's.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
+
+    // 3. Client X dimension larger than hosts, Y dimension smaller.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 640), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
+
+    // 4. Client dimensions larger than host's by <2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 900), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
+
+    // 5. Client dimensions larger than host's by >2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 1024), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true);
+    QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
+});
+
+test('choosePluginSize() with shrink-to-fit disabled',
+  function() {
+    // 1. Client & host size the same.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 2. Client logical dimensions smaller than host's.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(1024, 600));
+
+    // 3. Client dimensions larger than host's by <2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(640, 480));
+
+    // 4. Client dimensions larger than host's by >2x.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
+
+    // 5. Client smaller than host, client high-DPI, host low-DPI.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(1024, 600));
+
+    // 6. Client smaller than host, client low-DPI, host high-DPI.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(1024, 600));
+
+    // 7. Client smaller than host, both high-DPI.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(512, (512 / 1024) * 600));
+
+    // 8. Client smaller than host, client high-DPI, host 150% DPI.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, false);
+    QUnit.deepEqual(pluginSize, size(512, (512 / 1024) * 600));
+});
+
+test('choosePluginSize() full-screen multi-monitor optimization',
+  function() {
+    // Each test has a host sized to approximate two or more monitors.
+
+    // 1. Client & host per-monitor dimensions match, two monitors side-by-side.
+    var pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(2 * 640, 480), dpi(96, 96), 1.0, true, true);
+    QUnit.deepEqual(pluginSize, size(2 * 640, 480));
+
+    // 2. Client & host per-monitor dimensions match, two monitors stacked.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true);
+    QUnit.deepEqual(pluginSize, size(640, 2 * 480));
+
+    // 3. Client larger, two monitors stacked.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1024, 768), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true);
+    QUnit.deepEqual(pluginSize, size(640 * (768 / (2 * 480)), 768));
+
+    // 4. Client smaller, two monitors stacked.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(640, 480), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0, true, true);
+    QUnit.deepEqual(pluginSize, size(640, 2 * 768 * (640 / 1024)));
+
+    // 5. Client wide-screen, host two standard monitors stacked.
+    pluginSize = remoting.ClientSession.choosePluginSize(
+        size(1920, 1080), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0,
+        true, true);
+    QUnit.deepEqual(pluginSize, size(1024 * (1080 / (2 * 768)), 1080));
+});
+
+})();