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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/webapp/unittests/client_session_unittest.js

Issue 804783002: Improve DPI matching & scaling logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix multi-monitor specialization & update tests Created 5 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« remoting/remoting_webapp_files.gypi ('K') | « remoting/webapp/crd/js/client_session.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/unittests/client_session_unittest.js
diff --git a/remoting/webapp/unittests/client_session_unittest.js b/remoting/webapp/unittests/client_session_unittest.js
new file mode 100644
index 0000000000000000000000000000000000000000..87aea70c35fa992b13d9dfbbb27414be5ded90ae
--- /dev/null
+++ b/remoting/webapp/unittests/client_session_unittest.js
@@ -0,0 +1,281 @@
+// 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',
Jamie 2015/02/09 23:52:35 s/same/low/? (since you have a test for both being
Wez 2015/02/13 18:59:08 Done.
+ 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 Y dimension larger than hosts, X dimension smaller.
+ 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));
Jamie 2015/02/09 23:52:35 I realize it's mathematically the same, but if you
Wez 2015/02/13 18:59:08 Done.
+});
+
+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 Y dimension larger than hosts, X 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));
Jamie 2015/02/09 23:52:35 I don't understand how 3/2 is relevant to these ca
Wez 2015/02/13 18:59:08 Done.
+
+ // 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 Y dimension larger than hosts, X 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 Y dimension larger than hosts, X 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 Y dimension larger than hosts, X 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() handles high-DPI client, 125% DPI host',
+ function() {
+ // 1. Client & host size the same.
+ var pluginSize = remoting.ClientSession.choosePluginSize(
+ size(640, 480), 2.0, size(640, 480), dpi(120, 120), 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(120, 120), 1.0, false, true);
+ QUnit.deepEqual(pluginSize, size(640, 600 * (640 / 1024)));
+
+ // 3. Client Y dimension larger than hosts, X dimension smaller.
+ pluginSize = remoting.ClientSession.choosePluginSize(
+ size(640, 640), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true);
+ QUnit.deepEqual(pluginSize, size(640, 600 * (640 / 1024)));
+
+ // 4. Client dimensions larger than host's by <2x.
+ pluginSize = remoting.ClientSession.choosePluginSize(
+ size(1280, 900), 2.0, size(640, 480), dpi(120, 120), 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(120, 120), 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));
+
+ // 6. Client & host per-monitor dimensions match, two monitors stacked,
+ // high-DPI client.
+ pluginSize = remoting.ClientSession.choosePluginSize(
+ size(640, 480), 2.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true);
+ QUnit.deepEqual(pluginSize, size(640, 2 * 480));
+
+ // 7. Client & host per-monitor dimensions match, two monitors stacked,
+ // high-DPI host.
+ pluginSize = remoting.ClientSession.choosePluginSize(
+ size(640, 480), 1.0, size(640, 2 * 480), dpi(192, 192),
+ 1.0, true, true);
+ QUnit.deepEqual(pluginSize, size(640, 2 * 480));
+
+ // 8. Client & host per-monitor dimensions match, two monitors stacked,
+ // high-DPI client & host.
+ pluginSize = remoting.ClientSession.choosePluginSize(
+ size(640, 480), 2.0, size(640, 2 * 480), dpi(192, 192),
+ 1.0, true, true);
+ QUnit.deepEqual(pluginSize, size(640 / 2.0, (2 * 480) / 2.0));
+});
+
+})();
« remoting/remoting_webapp_files.gypi ('K') | « remoting/webapp/crd/js/client_session.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698