| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 (function() { | 5 (function() { |
| 6 | 6 |
| 7 'use strict'; | 7 'use strict'; |
| 8 | 8 |
| 9 /** | 9 /** |
| 10 * @param {number} width | 10 * @param {number} width |
| 11 * @param {number} height | 11 * @param {number} height |
| 12 * @return {{width:number, height:number}} | 12 * @return {{width:number, height:number}} |
| 13 */ | 13 */ |
| 14 function size(width, height) { | 14 function size(width, height) { |
| 15 return {width: width, height: height}; | 15 return {width: width, height: height}; |
| 16 } | 16 } |
| 17 | 17 |
| 18 /** | 18 /** |
| 19 * @param {number} x | 19 * @param {number} x |
| 20 * @param {number} y | 20 * @param {number} y |
| 21 * @return {{x:number, y:number}} | 21 * @return {{x:number, y:number}} |
| 22 */ | 22 */ |
| 23 function dpi(x, y) { | 23 function dpi(x, y) { |
| 24 return {x: x, y: y}; | 24 return {x: x, y: y}; |
| 25 } | 25 } |
| 26 | 26 |
| 27 module('DesktopViewport'); | 27 QUnit.module('DesktopViewport'); |
| 28 | 28 |
| 29 test('choosePluginSize() handles low-DPI client & host', | 29 QUnit.test('choosePluginSize() handles low-DPI client & host', |
| 30 function() { | 30 function(assert) { |
| 31 // 1. Client & host size the same. | 31 // 1. Client & host size the same. |
| 32 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 32 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 33 size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true); | 33 size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true); |
| 34 QUnit.deepEqual(pluginSize, size(640, 480)); | 34 assert.deepEqual(pluginSize, size(640, 480)); |
| 35 | 35 |
| 36 // 2. Client logical dimensions smaller than host's. | 36 // 2. Client logical dimensions smaller than host's. |
| 37 pluginSize = remoting.DesktopViewport.choosePluginSize( | 37 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 38 size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true); | 38 size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true); |
| 39 QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); | 39 assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); |
| 40 | 40 |
| 41 // 3. Client Y dimension larger than host's, X dimension smaller. | 41 // 3. Client Y dimension larger than host's, X dimension smaller. |
| 42 pluginSize = remoting.DesktopViewport.choosePluginSize( | 42 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 43 size(640, 640), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true); | 43 size(640, 640), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, true); |
| 44 QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); | 44 assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); |
| 45 | 45 |
| 46 // 4. Client dimensions larger than host's by <2x. | 46 // 4. Client dimensions larger than host's by <2x. |
| 47 pluginSize = remoting.DesktopViewport.choosePluginSize( | 47 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 48 size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true); | 48 size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true); |
| 49 QUnit.deepEqual(pluginSize, size(640, 480)); | 49 assert.deepEqual(pluginSize, size(640, 480)); |
| 50 | 50 |
| 51 // 5. Client dimensions larger than host's by >2x. | 51 // 5. Client dimensions larger than host's by >2x. |
| 52 pluginSize = remoting.DesktopViewport.choosePluginSize( | 52 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 53 size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true); | 53 size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, true); |
| 54 QUnit.deepEqual(pluginSize, size(2 * 640, 2 * 480)); | 54 assert.deepEqual(pluginSize, size(2 * 640, 2 * 480)); |
| 55 | 55 |
| 56 // 6. Client X dimension larger than host's, Y dimension smaller. | 56 // 6. Client X dimension larger than host's, Y dimension smaller. |
| 57 pluginSize = remoting.DesktopViewport.choosePluginSize( | 57 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 58 size(1152, 600), 1.0, size(1024, 768), dpi(96, 96), 1.0, false, true); | 58 size(1152, 600), 1.0, size(1024, 768), dpi(96, 96), 1.0, false, true); |
| 59 QUnit.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); | 59 assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); |
| 60 }); | 60 }); |
| 61 | 61 |
| 62 test('choosePluginSize() handles high-DPI client, low-DPI host', | 62 QUnit.test('choosePluginSize() handles high-DPI client, low-DPI host', |
| 63 function() { | 63 function(assert) { |
| 64 // 1. Client & host size the same. | 64 // 1. Client & host size the same. |
| 65 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 65 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 66 size(640, 480), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true); | 66 size(640, 480), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true); |
| 67 QUnit.deepEqual(pluginSize, size(640, 480)); | 67 assert.deepEqual(pluginSize, size(640, 480)); |
| 68 | 68 |
| 69 // 2. Client logical dimensions smaller than host's. | 69 // 2. Client logical dimensions smaller than host's. |
| 70 pluginSize = remoting.DesktopViewport.choosePluginSize( | 70 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 71 size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true); | 71 size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true); |
| 72 QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); | 72 assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); |
| 73 | 73 |
| 74 // 3. Client Y dimension larger than host's, X dimension smaller. | 74 // 3. Client Y dimension larger than host's, X dimension smaller. |
| 75 pluginSize = remoting.DesktopViewport.choosePluginSize( | 75 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 76 size(640, 640), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true); | 76 size(640, 640), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, true); |
| 77 QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); | 77 assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); |
| 78 | 78 |
| 79 // 4. Client logical dimensions larger than host's by <2x. | 79 // 4. Client logical dimensions larger than host's by <2x. |
| 80 // Host dimensions fit into the client's _device_ dimensions 3x, so the | 80 // Host dimensions fit into the client's _device_ dimensions 3x, so the |
| 81 // size in client DIPs should be 1:3/2. | 81 // size in client DIPs should be 1:3/2. |
| 82 pluginSize = remoting.DesktopViewport.choosePluginSize( | 82 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 83 size(1280, 900), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true); | 83 size(1280, 900), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true); |
| 84 QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); | 84 assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); |
| 85 | 85 |
| 86 // 5. Client dimensions larger than host's by >2x. | 86 // 5. Client dimensions larger than host's by >2x. |
| 87 pluginSize = remoting.DesktopViewport.choosePluginSize( | 87 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 88 size(1280, 1024), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true); | 88 size(1280, 1024), 2.0, size(640, 480), dpi(96, 96), 1.0, false, true); |
| 89 QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); | 89 assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); |
| 90 | 90 |
| 91 // 6. Client X dimension larger than host's, Y dimension smaller. | 91 // 6. Client X dimension larger than host's, Y dimension smaller. |
| 92 pluginSize = remoting.DesktopViewport.choosePluginSize( | 92 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 93 size(1152, 600), 2.0, size(1024, 768), dpi(96, 96), 1.0, false, true); | 93 size(1152, 600), 2.0, size(1024, 768), dpi(96, 96), 1.0, false, true); |
| 94 QUnit.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); | 94 assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); |
| 95 }); | 95 }); |
| 96 | 96 |
| 97 test('choosePluginSize() handles low-DPI client, high-DPI host', | 97 QUnit.test('choosePluginSize() handles low-DPI client, high-DPI host', |
| 98 function() { | 98 function(assert) { |
| 99 // 1. Client & host size the same. | 99 // 1. Client & host size the same. |
| 100 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 100 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 101 size(640, 480), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true); | 101 size(640, 480), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true); |
| 102 QUnit.deepEqual(pluginSize, size(640, 480)); | 102 assert.deepEqual(pluginSize, size(640, 480)); |
| 103 | 103 |
| 104 // 2. Client logical dimensions smaller than host's. | 104 // 2. Client logical dimensions smaller than host's. |
| 105 pluginSize = remoting.DesktopViewport.choosePluginSize( | 105 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 106 size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true); | 106 size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true); |
| 107 QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); | 107 assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); |
| 108 | 108 |
| 109 // 3. Client Y dimension larger than host's, X dimension smaller. | 109 // 3. Client Y dimension larger than host's, X dimension smaller. |
| 110 pluginSize = remoting.DesktopViewport.choosePluginSize( | 110 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 111 size(640, 640), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true); | 111 size(640, 640), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, true); |
| 112 QUnit.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); | 112 assert.deepEqual(pluginSize, size(640, (640 / 1024) * 600)); |
| 113 | 113 |
| 114 // 4. Client dimensions larger than host's by <2x. | 114 // 4. Client dimensions larger than host's by <2x. |
| 115 pluginSize = remoting.DesktopViewport.choosePluginSize( | 115 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 116 size(1280, 900), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true); | 116 size(1280, 900), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true); |
| 117 QUnit.deepEqual(pluginSize, size(640, 480)); | 117 assert.deepEqual(pluginSize, size(640, 480)); |
| 118 | 118 |
| 119 // 5. Client dimensions larger than host's by >2x. | 119 // 5. Client dimensions larger than host's by >2x. |
| 120 pluginSize = remoting.DesktopViewport.choosePluginSize( | 120 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 121 size(1280, 1024), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true); | 121 size(1280, 1024), 1.0, size(640, 480), dpi(192, 192), 1.0, false, true); |
| 122 QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); | 122 assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); |
| 123 | 123 |
| 124 // 6. Client X dimension larger than host's, Y dimension smaller. | 124 // 6. Client X dimension larger than host's, Y dimension smaller. |
| 125 pluginSize = remoting.DesktopViewport.choosePluginSize( | 125 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 126 size(1152, 600), 1.0, size(1024, 768), dpi(192, 192), 1.0, false, true); | 126 size(1152, 600), 1.0, size(1024, 768), dpi(192, 192), 1.0, false, true); |
| 127 QUnit.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); | 127 assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); |
| 128 }); | 128 }); |
| 129 | 129 |
| 130 test('choosePluginSize() handles high-DPI client and host', | 130 QUnit.test('choosePluginSize() handles high-DPI client and host', |
| 131 function() { | 131 function(assert) { |
| 132 // 1. Client & host size the same. | 132 // 1. Client & host size the same. |
| 133 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 133 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 134 size(640, 480), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true); | 134 size(640, 480), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true); |
| 135 QUnit.deepEqual(pluginSize, size(640, 480)); | 135 assert.deepEqual(pluginSize, size(640, 480)); |
| 136 | 136 |
| 137 // 2. Client logical dimensions smaller than host's. | 137 // 2. Client logical dimensions smaller than host's. |
| 138 pluginSize = remoting.DesktopViewport.choosePluginSize( | 138 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 139 size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true); | 139 size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true); |
| 140 QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); | 140 assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); |
| 141 | 141 |
| 142 // 3. Client Y dimension larger than host's, X dimension smaller. | 142 // 3. Client Y dimension larger than host's, X dimension smaller. |
| 143 pluginSize = remoting.DesktopViewport.choosePluginSize( | 143 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 144 size(640, 640), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true); | 144 size(640, 640), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, true); |
| 145 QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); | 145 assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); |
| 146 | 146 |
| 147 // 4. Client logical dimensions larger than host's by <2x. | 147 // 4. Client logical dimensions larger than host's by <2x. |
| 148 // Host dimensions fit into the client's _device_ dimensions 3x, so the | 148 // Host dimensions fit into the client's _device_ dimensions 3x, so the |
| 149 // size in client DIPs should be 1:3/2. | 149 // size in client DIPs should be 1:3/2. |
| 150 pluginSize = remoting.DesktopViewport.choosePluginSize( | 150 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 151 size(1280, 900), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true); | 151 size(1280, 900), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true); |
| 152 QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); | 152 assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); |
| 153 | 153 |
| 154 // 5. Client dimensions larger than host's by >2x. | 154 // 5. Client dimensions larger than host's by >2x. |
| 155 pluginSize = remoting.DesktopViewport.choosePluginSize( | 155 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 156 size(1280, 1024), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true); | 156 size(1280, 1024), 2.0, size(640, 480), dpi(192, 192), 1.0, false, true); |
| 157 QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); | 157 assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); |
| 158 | 158 |
| 159 // 6. Client X dimension larger than host's, Y dimension smaller. | 159 // 6. Client X dimension larger than host's, Y dimension smaller. |
| 160 pluginSize = remoting.DesktopViewport.choosePluginSize( | 160 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 161 size(1152, 600), 2.0, size(1024, 768), dpi(192, 192), 1.0, false, true); | 161 size(1152, 600), 2.0, size(1024, 768), dpi(192, 192), 1.0, false, true); |
| 162 QUnit.deepEqual(pluginSize, size(1024 / 2.0, 768 / 2.0)); | 162 assert.deepEqual(pluginSize, size(1024 / 2.0, 768 / 2.0)); |
| 163 }); | 163 }); |
| 164 | 164 |
| 165 test('choosePluginSize() handles high-DPI client, 150% DPI host', | 165 QUnit.test('choosePluginSize() handles high-DPI client, 150% DPI host', |
| 166 function() { | 166 function(assert) { |
| 167 // 1. Client & host size the same. | 167 // 1. Client & host size the same. |
| 168 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 168 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 169 size(640, 480), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true); | 169 size(640, 480), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true); |
| 170 QUnit.deepEqual(pluginSize, size(640, 480)); | 170 assert.deepEqual(pluginSize, size(640, 480)); |
| 171 | 171 |
| 172 // 2. Client dimensions smaller than host's. | 172 // 2. Client dimensions smaller than host's. |
| 173 pluginSize = remoting.DesktopViewport.choosePluginSize( | 173 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 174 size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true); | 174 size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true); |
| 175 QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); | 175 assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); |
| 176 | 176 |
| 177 // 3. Client Y dimension larger than host's, X dimension smaller. | 177 // 3. Client Y dimension larger than host's, X dimension smaller. |
| 178 pluginSize = remoting.DesktopViewport.choosePluginSize( | 178 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 179 size(640, 640), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true); | 179 size(640, 640), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, true); |
| 180 QUnit.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); | 180 assert.deepEqual(pluginSize, size(1024 / 2.0, 600 / 2.0)); |
| 181 | 181 |
| 182 // 4. Client dimensions larger than host's by <2x. | 182 // 4. Client dimensions larger than host's by <2x. |
| 183 // Host dimensions fit into the client's _device_ dimensions 3x, so the | 183 // Host dimensions fit into the client's _device_ dimensions 3x, so the |
| 184 // size in client DIPs should be 1:3/2. | 184 // size in client DIPs should be 1:3/2. |
| 185 pluginSize = remoting.DesktopViewport.choosePluginSize( | 185 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 186 size(1280, 900), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true); | 186 size(1280, 900), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true); |
| 187 QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); | 187 assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); |
| 188 | 188 |
| 189 // 5. Client dimensions larger than host's by >2x. | 189 // 5. Client dimensions larger than host's by >2x. |
| 190 pluginSize = remoting.DesktopViewport.choosePluginSize( | 190 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 191 size(1280, 1024), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true); | 191 size(1280, 1024), 2.0, size(640, 480), dpi(144, 144), 1.0, false, true); |
| 192 QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); | 192 assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); |
| 193 | 193 |
| 194 // 6. Client X dimension larger than host's, Y dimension smaller. | 194 // 6. Client X dimension larger than host's, Y dimension smaller. |
| 195 pluginSize = remoting.DesktopViewport.choosePluginSize( | 195 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 196 size(1152, 600), 2.0, size(1024, 768), dpi(144, 144), 1.0, false, true); | 196 size(1152, 600), 2.0, size(1024, 768), dpi(144, 144), 1.0, false, true); |
| 197 QUnit.deepEqual(pluginSize, size(1024 / 2.0, 768 / 2.0)); | 197 assert.deepEqual(pluginSize, size(1024 / 2.0, 768 / 2.0)); |
| 198 }); | 198 }); |
| 199 | 199 |
| 200 test('choosePluginSize() handles high-DPI client, 125% DPI host', | 200 QUnit.test('choosePluginSize() handles high-DPI client, 125% DPI host', |
| 201 function() { | 201 function(assert) { |
| 202 // 1. Client & host size the same. | 202 // 1. Client & host size the same. |
| 203 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 203 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 204 size(640, 480), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true); | 204 size(640, 480), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true); |
| 205 QUnit.deepEqual(pluginSize, size(640, 480)); | 205 assert.deepEqual(pluginSize, size(640, 480)); |
| 206 | 206 |
| 207 // 2. Client dimensions smaller than host's. | 207 // 2. Client dimensions smaller than host's. |
| 208 pluginSize = remoting.DesktopViewport.choosePluginSize( | 208 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 209 size(640, 480), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true); | 209 size(640, 480), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true); |
| 210 QUnit.deepEqual(pluginSize, size(640, 600 * (640 / 1024))); | 210 assert.deepEqual(pluginSize, size(640, 600 * (640 / 1024))); |
| 211 | 211 |
| 212 // 3. Client Y dimension larger than host's, X dimension smaller. | 212 // 3. Client Y dimension larger than host's, X dimension smaller. |
| 213 pluginSize = remoting.DesktopViewport.choosePluginSize( | 213 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 214 size(640, 640), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true); | 214 size(640, 640), 2.0, size(1024, 600), dpi(120, 120), 1.0, false, true); |
| 215 QUnit.deepEqual(pluginSize, size(640, 600 * (640 / 1024))); | 215 assert.deepEqual(pluginSize, size(640, 600 * (640 / 1024))); |
| 216 | 216 |
| 217 // 4. Client dimensions larger than host's by <2x. | 217 // 4. Client dimensions larger than host's by <2x. |
| 218 // Host dimensions fit into the client's _device_ dimensions 3x, so the | 218 // Host dimensions fit into the client's _device_ dimensions 3x, so the |
| 219 // size in client DIPs should be 1:3/2. | 219 // size in client DIPs should be 1:3/2. |
| 220 pluginSize = remoting.DesktopViewport.choosePluginSize( | 220 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 221 size(1280, 900), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true); | 221 size(1280, 900), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true); |
| 222 QUnit.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); | 222 assert.deepEqual(pluginSize, size(640 * 3 / 2.0, 480 * 3 / 2.0)); |
| 223 | 223 |
| 224 // 5. Client dimensions larger than host's by >2x. | 224 // 5. Client dimensions larger than host's by >2x. |
| 225 pluginSize = remoting.DesktopViewport.choosePluginSize( | 225 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 226 size(1280, 1024), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true); | 226 size(1280, 1024), 2.0, size(640, 480), dpi(120, 120), 1.0, false, true); |
| 227 QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); | 227 assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); |
| 228 | 228 |
| 229 // 6. Client X dimension larger than host's, Y dimension smaller. | 229 // 6. Client X dimension larger than host's, Y dimension smaller. |
| 230 pluginSize = remoting.DesktopViewport.choosePluginSize( | 230 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 231 size(1152, 600), 2.0, size(1024, 768), dpi(120, 120), 1.0, false, true); | 231 size(1152, 600), 2.0, size(1024, 768), dpi(120, 120), 1.0, false, true); |
| 232 QUnit.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); | 232 assert.deepEqual(pluginSize, size(1024 * (600 / 768), 600)); |
| 233 }); | 233 }); |
| 234 | 234 |
| 235 test('choosePluginSize() with shrink-to-fit disabled', | 235 QUnit.test('choosePluginSize() with shrink-to-fit disabled', |
| 236 function() { | 236 function(assert) { |
| 237 // 1. Client & host size the same. | 237 // 1. Client & host size the same. |
| 238 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 238 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 239 size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false); | 239 size(640, 480), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false); |
| 240 QUnit.deepEqual(pluginSize, size(640, 480)); | 240 assert.deepEqual(pluginSize, size(640, 480)); |
| 241 | 241 |
| 242 // 2. Client logical dimensions smaller than host's. | 242 // 2. Client logical dimensions smaller than host's. |
| 243 pluginSize = remoting.DesktopViewport.choosePluginSize( | 243 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 244 size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, false); | 244 size(640, 480), 1.0, size(1024, 600), dpi(96, 96), 1.0, false, false); |
| 245 QUnit.deepEqual(pluginSize, size(1024, 600)); | 245 assert.deepEqual(pluginSize, size(1024, 600)); |
| 246 | 246 |
| 247 // 3. Client dimensions larger than host's by <2x. | 247 // 3. Client dimensions larger than host's by <2x. |
| 248 pluginSize = remoting.DesktopViewport.choosePluginSize( | 248 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 249 size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false); | 249 size(1280, 900), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false); |
| 250 QUnit.deepEqual(pluginSize, size(640, 480)); | 250 assert.deepEqual(pluginSize, size(640, 480)); |
| 251 | 251 |
| 252 // 4. Client dimensions larger than host's by >2x. | 252 // 4. Client dimensions larger than host's by >2x. |
| 253 pluginSize = remoting.DesktopViewport.choosePluginSize( | 253 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 254 size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false); | 254 size(1280, 1024), 1.0, size(640, 480), dpi(96, 96), 1.0, false, false); |
| 255 QUnit.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); | 255 assert.deepEqual(pluginSize, size(1280, (1280 / 640) * 480)); |
| 256 | 256 |
| 257 // 5. Client smaller than host, client high-DPI, host low-DPI. | 257 // 5. Client smaller than host, client high-DPI, host low-DPI. |
| 258 pluginSize = remoting.DesktopViewport.choosePluginSize( | 258 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 259 size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, false); | 259 size(640, 480), 2.0, size(1024, 600), dpi(96, 96), 1.0, false, false); |
| 260 QUnit.deepEqual(pluginSize, size(1024, 600)); | 260 assert.deepEqual(pluginSize, size(1024, 600)); |
| 261 | 261 |
| 262 // 6. Client smaller than host, client low-DPI, host high-DPI. | 262 // 6. Client smaller than host, client low-DPI, host high-DPI. |
| 263 pluginSize = remoting.DesktopViewport.choosePluginSize( | 263 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 264 size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, false); | 264 size(640, 480), 1.0, size(1024, 600), dpi(192, 192), 1.0, false, false); |
| 265 QUnit.deepEqual(pluginSize, size(1024, 600)); | 265 assert.deepEqual(pluginSize, size(1024, 600)); |
| 266 | 266 |
| 267 // 7. Client smaller than host, both high-DPI. | 267 // 7. Client smaller than host, both high-DPI. |
| 268 pluginSize = remoting.DesktopViewport.choosePluginSize( | 268 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 269 size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, false); | 269 size(640, 480), 2.0, size(1024, 600), dpi(192, 192), 1.0, false, false); |
| 270 QUnit.deepEqual(pluginSize, size(512, (512 / 1024) * 600)); | 270 assert.deepEqual(pluginSize, size(512, (512 / 1024) * 600)); |
| 271 | 271 |
| 272 // 8. Client smaller than host, client high-DPI, host 150% DPI. | 272 // 8. Client smaller than host, client high-DPI, host 150% DPI. |
| 273 pluginSize = remoting.DesktopViewport.choosePluginSize( | 273 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 274 size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, false); | 274 size(640, 480), 2.0, size(1024, 600), dpi(144, 144), 1.0, false, false); |
| 275 QUnit.deepEqual(pluginSize, size(512, (512 / 1024) * 600)); | 275 assert.deepEqual(pluginSize, size(512, (512 / 1024) * 600)); |
| 276 }); | 276 }); |
| 277 | 277 |
| 278 test('choosePluginSize() full-screen multi-monitor optimization', | 278 QUnit.test('choosePluginSize() full-screen multi-monitor optimization', |
| 279 function() { | 279 function(assert) { |
| 280 // Each test has a host sized to approximate two or more monitors. | 280 // Each test has a host sized to approximate two or more monitors. |
| 281 | 281 |
| 282 // 1. Client & host per-monitor dimensions match, two monitors side-by-side. | 282 // 1. Client & host per-monitor dimensions match, two monitors side-by-side. |
| 283 var pluginSize = remoting.DesktopViewport.choosePluginSize( | 283 var pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 284 size(640, 480), 1.0, size(2 * 640, 480), dpi(96, 96), 1.0, true, true); | 284 size(640, 480), 1.0, size(2 * 640, 480), dpi(96, 96), 1.0, true, true); |
| 285 QUnit.deepEqual(pluginSize, size(2 * 640, 480)); | 285 assert.deepEqual(pluginSize, size(2 * 640, 480)); |
| 286 | 286 |
| 287 // 2. Client & host per-monitor dimensions match, two monitors stacked. | 287 // 2. Client & host per-monitor dimensions match, two monitors stacked. |
| 288 pluginSize = remoting.DesktopViewport.choosePluginSize( | 288 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 289 size(640, 480), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true); | 289 size(640, 480), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true); |
| 290 QUnit.deepEqual(pluginSize, size(640, 2 * 480)); | 290 assert.deepEqual(pluginSize, size(640, 2 * 480)); |
| 291 | 291 |
| 292 // 3. Client larger, two monitors stacked. | 292 // 3. Client larger, two monitors stacked. |
| 293 pluginSize = remoting.DesktopViewport.choosePluginSize( | 293 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 294 size(1024, 768), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true); | 294 size(1024, 768), 1.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true); |
| 295 QUnit.deepEqual(pluginSize, size(640 * (768 / (2 * 480)), 768)); | 295 assert.deepEqual(pluginSize, size(640 * (768 / (2 * 480)), 768)); |
| 296 | 296 |
| 297 // 4. Client smaller, two monitors stacked. | 297 // 4. Client smaller, two monitors stacked. |
| 298 pluginSize = remoting.DesktopViewport.choosePluginSize( | 298 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 299 size(640, 480), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0, true, true); | 299 size(640, 480), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0, true, true); |
| 300 QUnit.deepEqual(pluginSize, size(640, 2 * 768 * (640 / 1024))); | 300 assert.deepEqual(pluginSize, size(640, 2 * 768 * (640 / 1024))); |
| 301 | 301 |
| 302 // 5. Client wide-screen, host two standard monitors stacked. | 302 // 5. Client wide-screen, host two standard monitors stacked. |
| 303 pluginSize = remoting.DesktopViewport.choosePluginSize( | 303 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 304 size(1920, 1080), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0, | 304 size(1920, 1080), 1.0, size(1024, 2 * 768), dpi(96, 96), 1.0, |
| 305 true, true); | 305 true, true); |
| 306 QUnit.deepEqual(pluginSize, size(1024 * (1080 / (2 * 768)), 1080)); | 306 assert.deepEqual(pluginSize, size(1024 * (1080 / (2 * 768)), 1080)); |
| 307 | 307 |
| 308 // 6. Client & host per-monitor dimensions match, two monitors stacked, | 308 // 6. Client & host per-monitor dimensions match, two monitors stacked, |
| 309 // high-DPI client. | 309 // high-DPI client. |
| 310 pluginSize = remoting.DesktopViewport.choosePluginSize( | 310 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 311 size(640, 480), 2.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true); | 311 size(640, 480), 2.0, size(640, 2 * 480), dpi(96, 96), 1.0, true, true); |
| 312 QUnit.deepEqual(pluginSize, size(640, 2 * 480)); | 312 assert.deepEqual(pluginSize, size(640, 2 * 480)); |
| 313 | 313 |
| 314 // 7. Client & host per-monitor dimensions match, two monitors stacked, | 314 // 7. Client & host per-monitor dimensions match, two monitors stacked, |
| 315 // high-DPI host. | 315 // high-DPI host. |
| 316 pluginSize = remoting.DesktopViewport.choosePluginSize( | 316 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 317 size(640, 480), 1.0, size(640, 2 * 480), dpi(192, 192), | 317 size(640, 480), 1.0, size(640, 2 * 480), dpi(192, 192), |
| 318 1.0, true, true); | 318 1.0, true, true); |
| 319 QUnit.deepEqual(pluginSize, size(640, 2 * 480)); | 319 assert.deepEqual(pluginSize, size(640, 2 * 480)); |
| 320 | 320 |
| 321 // 8. Client & host per-monitor dimensions match, two monitors stacked, | 321 // 8. Client & host per-monitor dimensions match, two monitors stacked, |
| 322 // high-DPI client & host. | 322 // high-DPI client & host. |
| 323 pluginSize = remoting.DesktopViewport.choosePluginSize( | 323 pluginSize = remoting.DesktopViewport.choosePluginSize( |
| 324 size(640, 480), 2.0, size(640, 2 * 480), dpi(192, 192), | 324 size(640, 480), 2.0, size(640, 2 * 480), dpi(192, 192), |
| 325 1.0, true, true); | 325 1.0, true, true); |
| 326 QUnit.deepEqual(pluginSize, size(640 / 2.0, (2 * 480) / 2.0)); | 326 assert.deepEqual(pluginSize, size(640 / 2.0, (2 * 480) / 2.0)); |
| 327 }); | 327 }); |
| 328 | 328 |
| 329 })(); | 329 })(); |
| OLD | NEW |