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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/webapp/base/js/viewport_unittest.js

Issue 1109453005: [Chromoting] Extract shared viewport code into viewport.js. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « remoting/webapp/base/js/viewport.js ('k') | remoting/webapp/crd/js/desktop_viewport.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/base/js/viewport_unittest.js
diff --git a/remoting/webapp/crd/js/desktop_viewport_unittest.js b/remoting/webapp/base/js/viewport_unittest.js
similarity index 79%
rename from remoting/webapp/crd/js/desktop_viewport_unittest.js
rename to remoting/webapp/base/js/viewport_unittest.js
index e9a3ddbc5e84db75627d192a3b9899ab1ccc6ed3..71d9d88a9e056de0562c1dd1a43d60746e065bce 100644
--- a/remoting/webapp/crd/js/desktop_viewport_unittest.js
+++ b/remoting/webapp/base/js/viewport_unittest.js
@@ -24,37 +24,37 @@ function dpi(x, y) {
return {x: x, y: y};
}
-QUnit.module('DesktopViewport');
+QUnit.module('Viewport');
QUnit.test('choosePluginSize() handles low-DPI client & host',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client logical dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
// 3. Client Y dimension larger than host's, X dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 640), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
// 4. Client dimensions larger than host's by <2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 5. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(2 * 640, 2 * 480));
// 6. Client X dimension larger than host's, Y dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1152, 600), 1.0, size(1024, 768), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600));
});
@@ -62,34 +62,34 @@ QUnit.test('choosePluginSize() handles low-DPI client & host',
QUnit.test('choosePluginSize() handles high-DPI client, low-DPI host',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client logical dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
// 3. Client Y dimension larger than host's, X dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 640), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
// 4. Client logical dimensions larger than host's by <2x.
// Host dimensions fit into the client's _device_ dimensions 3x, so the
// size in client DIPs should be 1:3/2.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
// 5. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
// 6. Client X dimension larger than host's, Y dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1152, 600), 2.0, size(1024, 768), dpi(96, 96), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600));
});
@@ -97,32 +97,32 @@ QUnit.test('choosePluginSize() handles high-DPI client, low-DPI host',
QUnit.test('choosePluginSize() handles low-DPI client, high-DPI host',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client logical dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
// 3. Client Y dimension larger than host's, X dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 640), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600));
// 4. Client dimensions larger than host's by <2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 5. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
// 6. Client X dimension larger than host's, Y dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1152, 600), 1.0, size(1024, 768), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600));
});
@@ -130,34 +130,34 @@ QUnit.test('choosePluginSize() handles low-DPI client, high-DPI host',
QUnit.test('choosePluginSize() handles high-DPI client and host',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client logical dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
// 3. Client Y dimension larger than host's, X dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 640), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
// 4. Client logical dimensions larger than host's by <2x.
// Host dimensions fit into the client's _device_ dimensions 3x, so the
// size in client DIPs should be 1:3/2.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
// 5. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
// 6. Client X dimension larger than host's, Y dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1152, 600), 2.0, size(1024, 768), dpi(192, 192), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 / 2.0, 768 / 2.0));
});
@@ -165,34 +165,34 @@ QUnit.test('choosePluginSize() handles high-DPI client and host',
QUnit.test('choosePluginSize() handles high-DPI client, 150% DPI host',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
// 3. Client Y dimension larger than host's, X dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 640), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0));
// 4. Client dimensions larger than host's by <2x.
// Host dimensions fit into the client's _device_ dimensions 3x, so the
// size in client DIPs should be 1:3/2.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true);
assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
// 5. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true);
assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
// 6. Client X dimension larger than host's, Y dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1152, 600), 2.0, size(1024, 768), dpi(144, 144), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 / 2.0, 768 / 2.0));
});
@@ -200,34 +200,34 @@ QUnit.test('choosePluginSize() handles high-DPI client, 150% DPI host',
QUnit.test('choosePluginSize() handles high-DPI client, 125% DPI host',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 600 * (640 / 1024)));
// 3. Client Y dimension larger than host's, X dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 640), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true);
assert.deepEqual(pluginSize, size(640, 600 * (640 / 1024)));
// 4. Client dimensions larger than host's by <2x.
// Host dimensions fit into the client's _device_ dimensions 3x, so the
// size in client DIPs should be 1:3/2.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true);
assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0));
// 5. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true);
assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
// 6. Client X dimension larger than host's, Y dimension smaller.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1152, 600), 2.0, size(1024, 768), dpi(120, 120), 1.0, false, true);
assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600));
});
@@ -235,42 +235,42 @@ QUnit.test('choosePluginSize() handles high-DPI client, 125% DPI host',
QUnit.test('choosePluginSize() with shrink-to-fit disabled',
function(assert) {
// 1. Client & host size the same.
- var pluginSize = remoting.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false);
assert.deepEqual(pluginSize, size(640, 480));
// 2. Client logical dimensions smaller than host's.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, false);
assert.deepEqual(pluginSize, size(1024, 600));
// 3. Client dimensions larger than host's by <2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false);
assert.deepEqual(pluginSize, size(640, 480));
// 4. Client dimensions larger than host's by >2x.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false);
assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480));
// 5. Client smaller than host, client high-DPI, host low-DPI.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, false);
assert.deepEqual(pluginSize, size(1024, 600));
// 6. Client smaller than host, client low-DPI, host high-DPI.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, false);
assert.deepEqual(pluginSize, size(1024, 600));
// 7. Client smaller than host, both high-DPI.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, false);
assert.deepEqual(pluginSize, size(512, (512 / 1024) * 600));
// 8. Client smaller than host, client high-DPI, host 150% DPI.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, false);
assert.deepEqual(pluginSize, size(512, (512 / 1024) * 600));
});
@@ -280,47 +280,47 @@ QUnit.test('choosePluginSize() full-screen multi-monitor optimization',
// 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.DesktopViewport.choosePluginSize(
+ var pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(2 * 640, 480), dpi(96, 96), 1.0, true, true);
assert.deepEqual(pluginSize, size(2 * 640, 480));
// 2. Client & host per-monitor dimensions match, two monitors stacked.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true);
assert.deepEqual(pluginSize, size(640, 2 * 480));
// 3. Client larger, two monitors stacked.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1024, 768), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true);
assert.deepEqual(pluginSize, size(640 * (768 / (2 * 480)), 768));
// 4. Client smaller, two monitors stacked.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0, true, true);
assert.deepEqual(pluginSize, size(640, 2 * 768 * (640 / 1024)));
// 5. Client wide-screen, host two standard monitors stacked.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(1920, 1080), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0,
true, true);
assert.deepEqual(pluginSize, size(1024 * (1080 / (2 * 768)), 1080));
// 6. Client & host per-monitor dimensions match, two monitors stacked,
// high-DPI client.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true);
assert.deepEqual(pluginSize, size(640, 2 * 480));
// 7. Client & host per-monitor dimensions match, two monitors stacked,
// high-DPI host.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 1.0, size(640, 2 * 480), dpi(192, 192),
1.0, true, true);
assert.deepEqual(pluginSize, size(640, 2 * 480));
// 8. Client & host per-monitor dimensions match, two monitors stacked,
// high-DPI client & host.
- pluginSize = remoting.DesktopViewport.choosePluginSize(
+ pluginSize = remoting.Viewport.choosePluginSize(
size(640, 480), 2.0, size(640, 2 * 480), dpi(192, 192),
1.0, true, true);
assert.deepEqual(pluginSize, size(640 / 2.0, (2 * 480) / 2.0));
« no previous file with comments | « remoting/webapp/base/js/viewport.js ('k') | remoting/webapp/crd/js/desktop_viewport.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698