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