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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/Source/web/tests/ViewportTest.cpp

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 years, 7 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 unified diff | Download patch
« third_party/WebKit/Source/web/ChromeClientImpl.cpp ('K') | « third_party/WebKit/Source/web/tests/TopControlsTest.cpp ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 constraints.fitToContentsWidth(constraints.layoutSize.width(), initialWidth) ; 106 constraints.fitToContentsWidth(constraints.layoutSize.width(), initialWidth) ;
107 constraints.resolveAutoInitialScale(); 107 constraints.resolveAutoInitialScale();
108 return constraints; 108 return constraints;
109 } 109 }
110 110
111 TEST_F(ViewportTest, viewport1) 111 TEST_F(ViewportTest, viewport1)
112 { 112 {
113 registerMockedHttpURLLoad("viewport/viewport-1.html"); 113 registerMockedHttpURLLoad("viewport/viewport-1.html");
114 114
115 FrameTestHelpers::WebViewHelper webViewHelper; 115 FrameTestHelpers::WebViewHelper webViewHelper;
116 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true , 0, 0, setViewportSettings); 116 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true , nullptr, nullptr, nullptr, setViewportSettings);
117 117
118 Page* page = webViewHelper.webViewImpl()->page(); 118 Page* page = webViewHelper.webViewImpl()->page();
119 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 119 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
120 120
121 EXPECT_EQ(320, constraints.layoutSize.width()); 121 EXPECT_EQ(320, constraints.layoutSize.width());
122 EXPECT_EQ(352, constraints.layoutSize.height()); 122 EXPECT_EQ(352, constraints.layoutSize.height());
123 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 123 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
124 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 124 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
125 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 125 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
126 EXPECT_TRUE(page->viewportDescription().userZoom); 126 EXPECT_TRUE(page->viewportDescription().userZoom);
127 } 127 }
128 128
129 TEST_F(ViewportTest, viewport2) 129 TEST_F(ViewportTest, viewport2)
130 { 130 {
131 registerMockedHttpURLLoad("viewport/viewport-2.html"); 131 registerMockedHttpURLLoad("viewport/viewport-2.html");
132 132
133 FrameTestHelpers::WebViewHelper webViewHelper; 133 FrameTestHelpers::WebViewHelper webViewHelper;
134 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-2.html", true , 0, 0, setViewportSettings); 134 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-2.html", true , nullptr, nullptr, nullptr, setViewportSettings);
135 135
136 Page* page = webViewHelper.webViewImpl()->page(); 136 Page* page = webViewHelper.webViewImpl()->page();
137 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 137 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
138 138
139 EXPECT_EQ(980, constraints.layoutSize.width()); 139 EXPECT_EQ(980, constraints.layoutSize.width());
140 EXPECT_EQ(352, constraints.layoutSize.height()); 140 EXPECT_EQ(352, constraints.layoutSize.height());
141 EXPECT_NEAR(0.32f, constraints.initialScale, 0.01f); 141 EXPECT_NEAR(0.32f, constraints.initialScale, 0.01f);
142 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f); 142 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f);
143 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 143 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
144 EXPECT_TRUE(page->viewportDescription().userZoom); 144 EXPECT_TRUE(page->viewportDescription().userZoom);
145 } 145 }
146 146
147 TEST_F(ViewportTest, viewport3) 147 TEST_F(ViewportTest, viewport3)
148 { 148 {
149 registerMockedHttpURLLoad("viewport/viewport-3.html"); 149 registerMockedHttpURLLoad("viewport/viewport-3.html");
150 150
151 FrameTestHelpers::WebViewHelper webViewHelper; 151 FrameTestHelpers::WebViewHelper webViewHelper;
152 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-3.html", true , 0, 0, setViewportSettings); 152 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-3.html", true , nullptr, nullptr, nullptr, setViewportSettings);
153 153
154 Page* page = webViewHelper.webViewImpl()->page(); 154 Page* page = webViewHelper.webViewImpl()->page();
155 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 155 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
156 156
157 EXPECT_EQ(320, constraints.layoutSize.width()); 157 EXPECT_EQ(320, constraints.layoutSize.width());
158 EXPECT_EQ(352, constraints.layoutSize.height()); 158 EXPECT_EQ(352, constraints.layoutSize.height());
159 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 159 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
160 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 160 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
161 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 161 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
162 EXPECT_TRUE(page->viewportDescription().userZoom); 162 EXPECT_TRUE(page->viewportDescription().userZoom);
163 } 163 }
164 164
165 TEST_F(ViewportTest, viewport4) 165 TEST_F(ViewportTest, viewport4)
166 { 166 {
167 registerMockedHttpURLLoad("viewport/viewport-4.html"); 167 registerMockedHttpURLLoad("viewport/viewport-4.html");
168 168
169 FrameTestHelpers::WebViewHelper webViewHelper; 169 FrameTestHelpers::WebViewHelper webViewHelper;
170 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-4.html", true , 0, 0, setViewportSettings); 170 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-4.html", true , nullptr, nullptr, nullptr, setViewportSettings);
171 171
172 Page* page = webViewHelper.webViewImpl()->page(); 172 Page* page = webViewHelper.webViewImpl()->page();
173 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 173 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
174 174
175 EXPECT_EQ(160, constraints.layoutSize.width()); 175 EXPECT_EQ(160, constraints.layoutSize.width());
176 EXPECT_EQ(176, constraints.layoutSize.height()); 176 EXPECT_EQ(176, constraints.layoutSize.height());
177 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f); 177 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f);
178 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f); 178 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f);
179 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 179 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
180 EXPECT_TRUE(page->viewportDescription().userZoom); 180 EXPECT_TRUE(page->viewportDescription().userZoom);
181 } 181 }
182 182
183 TEST_F(ViewportTest, viewport5) 183 TEST_F(ViewportTest, viewport5)
184 { 184 {
185 registerMockedHttpURLLoad("viewport/viewport-5.html"); 185 registerMockedHttpURLLoad("viewport/viewport-5.html");
186 186
187 FrameTestHelpers::WebViewHelper webViewHelper; 187 FrameTestHelpers::WebViewHelper webViewHelper;
188 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-5.html", true , 0, 0, setViewportSettings); 188 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-5.html", true , nullptr, nullptr, nullptr, setViewportSettings);
189 189
190 Page* page = webViewHelper.webViewImpl()->page(); 190 Page* page = webViewHelper.webViewImpl()->page();
191 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 191 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
192 192
193 EXPECT_EQ(640, constraints.layoutSize.width()); 193 EXPECT_EQ(640, constraints.layoutSize.width());
194 EXPECT_EQ(704, constraints.layoutSize.height()); 194 EXPECT_EQ(704, constraints.layoutSize.height());
195 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 195 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
196 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f); 196 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f);
197 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 197 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
198 EXPECT_TRUE(page->viewportDescription().userZoom); 198 EXPECT_TRUE(page->viewportDescription().userZoom);
199 } 199 }
200 200
201 TEST_F(ViewportTest, viewport6) 201 TEST_F(ViewportTest, viewport6)
202 { 202 {
203 registerMockedHttpURLLoad("viewport/viewport-6.html"); 203 registerMockedHttpURLLoad("viewport/viewport-6.html");
204 204
205 FrameTestHelpers::WebViewHelper webViewHelper; 205 FrameTestHelpers::WebViewHelper webViewHelper;
206 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-6.html", true , 0, 0, setViewportSettings); 206 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-6.html", true , nullptr, nullptr, nullptr, setViewportSettings);
207 207
208 Page* page = webViewHelper.webViewImpl()->page(); 208 Page* page = webViewHelper.webViewImpl()->page();
209 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 209 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
210 210
211 EXPECT_EQ(200, constraints.layoutSize.width()); 211 EXPECT_EQ(200, constraints.layoutSize.width());
212 EXPECT_EQ(220, constraints.layoutSize.height()); 212 EXPECT_EQ(220, constraints.layoutSize.height());
213 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f); 213 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f);
214 EXPECT_NEAR(1.6f, constraints.minimumScale, 0.01f); 214 EXPECT_NEAR(1.6f, constraints.minimumScale, 0.01f);
215 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 215 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
216 EXPECT_TRUE(page->viewportDescription().userZoom); 216 EXPECT_TRUE(page->viewportDescription().userZoom);
217 } 217 }
218 218
219 TEST_F(ViewportTest, viewport7) 219 TEST_F(ViewportTest, viewport7)
220 { 220 {
221 221
222 registerMockedHttpURLLoad("viewport/viewport-7.html"); 222 registerMockedHttpURLLoad("viewport/viewport-7.html");
223 223
224 FrameTestHelpers::WebViewHelper webViewHelper; 224 FrameTestHelpers::WebViewHelper webViewHelper;
225 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-7.html", true , 0, 0, setViewportSettings); 225 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-7.html", true , nullptr, nullptr, nullptr, setViewportSettings);
226 226
227 Page* page = webViewHelper.webViewImpl()->page(); 227 Page* page = webViewHelper.webViewImpl()->page();
228 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 228 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
229 229
230 EXPECT_EQ(1280, constraints.layoutSize.width()); 230 EXPECT_EQ(1280, constraints.layoutSize.width());
231 EXPECT_EQ(1408, constraints.layoutSize.height()); 231 EXPECT_EQ(1408, constraints.layoutSize.height());
232 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 232 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
233 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 233 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
234 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f); 234 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f);
235 EXPECT_TRUE(page->viewportDescription().userZoom); 235 EXPECT_TRUE(page->viewportDescription().userZoom);
236 } 236 }
237 237
238 TEST_F(ViewportTest, viewport8) 238 TEST_F(ViewportTest, viewport8)
239 { 239 {
240 registerMockedHttpURLLoad("viewport/viewport-8.html"); 240 registerMockedHttpURLLoad("viewport/viewport-8.html");
241 241
242 FrameTestHelpers::WebViewHelper webViewHelper; 242 FrameTestHelpers::WebViewHelper webViewHelper;
243 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-8.html", true , 0, 0, setViewportSettings); 243 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-8.html", true , nullptr, nullptr, nullptr, setViewportSettings);
244 244
245 Page* page = webViewHelper.webViewImpl()->page(); 245 Page* page = webViewHelper.webViewImpl()->page();
246 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 246 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
247 247
248 EXPECT_EQ(1280, constraints.layoutSize.width()); 248 EXPECT_EQ(1280, constraints.layoutSize.width());
249 EXPECT_EQ(1408, constraints.layoutSize.height()); 249 EXPECT_EQ(1408, constraints.layoutSize.height());
250 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 250 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
251 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 251 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
252 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f); 252 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f);
253 EXPECT_TRUE(page->viewportDescription().userZoom); 253 EXPECT_TRUE(page->viewportDescription().userZoom);
254 } 254 }
255 255
256 TEST_F(ViewportTest, viewport9) 256 TEST_F(ViewportTest, viewport9)
257 { 257 {
258 registerMockedHttpURLLoad("viewport/viewport-9.html"); 258 registerMockedHttpURLLoad("viewport/viewport-9.html");
259 259
260 FrameTestHelpers::WebViewHelper webViewHelper; 260 FrameTestHelpers::WebViewHelper webViewHelper;
261 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-9.html", true , 0, 0, setViewportSettings); 261 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-9.html", true , nullptr, nullptr, nullptr, setViewportSettings);
262 262
263 Page* page = webViewHelper.webViewImpl()->page(); 263 Page* page = webViewHelper.webViewImpl()->page();
264 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 264 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
265 265
266 EXPECT_EQ(1280, constraints.layoutSize.width()); 266 EXPECT_EQ(1280, constraints.layoutSize.width());
267 EXPECT_EQ(1408, constraints.layoutSize.height()); 267 EXPECT_EQ(1408, constraints.layoutSize.height());
268 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 268 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
269 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 269 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
270 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f); 270 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f);
271 EXPECT_TRUE(page->viewportDescription().userZoom); 271 EXPECT_TRUE(page->viewportDescription().userZoom);
272 } 272 }
273 273
274 TEST_F(ViewportTest, viewport10) 274 TEST_F(ViewportTest, viewport10)
275 { 275 {
276 registerMockedHttpURLLoad("viewport/viewport-10.html"); 276 registerMockedHttpURLLoad("viewport/viewport-10.html");
277 277
278 FrameTestHelpers::WebViewHelper webViewHelper; 278 FrameTestHelpers::WebViewHelper webViewHelper;
279 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-10.html", tru e, 0, 0, setViewportSettings); 279 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-10.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
280 280
281 Page* page = webViewHelper.webViewImpl()->page(); 281 Page* page = webViewHelper.webViewImpl()->page();
282 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 282 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
283 283
284 EXPECT_EQ(1280, constraints.layoutSize.width()); 284 EXPECT_EQ(1280, constraints.layoutSize.width());
285 EXPECT_EQ(1408, constraints.layoutSize.height()); 285 EXPECT_EQ(1408, constraints.layoutSize.height());
286 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 286 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
287 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 287 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
288 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f); 288 EXPECT_NEAR(0.25f, constraints.maximumScale, 0.01f);
289 EXPECT_TRUE(page->viewportDescription().userZoom); 289 EXPECT_TRUE(page->viewportDescription().userZoom);
290 } 290 }
291 291
292 TEST_F(ViewportTest, viewport11) 292 TEST_F(ViewportTest, viewport11)
293 { 293 {
294 registerMockedHttpURLLoad("viewport/viewport-11.html"); 294 registerMockedHttpURLLoad("viewport/viewport-11.html");
295 295
296 FrameTestHelpers::WebViewHelper webViewHelper; 296 FrameTestHelpers::WebViewHelper webViewHelper;
297 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-11.html", tru e, 0, 0, setViewportSettings); 297 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-11.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
298 298
299 Page* page = webViewHelper.webViewImpl()->page(); 299 Page* page = webViewHelper.webViewImpl()->page();
300 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 300 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
301 301
302 EXPECT_EQ(980, constraints.layoutSize.width()); 302 EXPECT_EQ(980, constraints.layoutSize.width());
303 EXPECT_EQ(1078, constraints.layoutSize.height()); 303 EXPECT_EQ(1078, constraints.layoutSize.height());
304 EXPECT_NEAR(0.32f, constraints.initialScale, 0.01f); 304 EXPECT_NEAR(0.32f, constraints.initialScale, 0.01f);
305 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f); 305 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f);
306 EXPECT_NEAR(0.5f, constraints.maximumScale, 0.01f); 306 EXPECT_NEAR(0.5f, constraints.maximumScale, 0.01f);
307 EXPECT_TRUE(page->viewportDescription().userZoom); 307 EXPECT_TRUE(page->viewportDescription().userZoom);
308 } 308 }
309 309
310 TEST_F(ViewportTest, viewport12) 310 TEST_F(ViewportTest, viewport12)
311 { 311 {
312 registerMockedHttpURLLoad("viewport/viewport-12.html"); 312 registerMockedHttpURLLoad("viewport/viewport-12.html");
313 313
314 FrameTestHelpers::WebViewHelper webViewHelper; 314 FrameTestHelpers::WebViewHelper webViewHelper;
315 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-12.html", tru e, 0, 0, setViewportSettings); 315 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-12.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
316 316
317 Page* page = webViewHelper.webViewImpl()->page(); 317 Page* page = webViewHelper.webViewImpl()->page();
318 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 318 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
319 319
320 EXPECT_EQ(640, constraints.layoutSize.width()); 320 EXPECT_EQ(640, constraints.layoutSize.width());
321 EXPECT_EQ(704, constraints.layoutSize.height()); 321 EXPECT_EQ(704, constraints.layoutSize.height());
322 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 322 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
323 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f); 323 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f);
324 EXPECT_NEAR(0.5f, constraints.maximumScale, 0.01f); 324 EXPECT_NEAR(0.5f, constraints.maximumScale, 0.01f);
325 EXPECT_TRUE(page->viewportDescription().userZoom); 325 EXPECT_TRUE(page->viewportDescription().userZoom);
326 } 326 }
327 327
328 TEST_F(ViewportTest, viewport13) 328 TEST_F(ViewportTest, viewport13)
329 { 329 {
330 registerMockedHttpURLLoad("viewport/viewport-13.html"); 330 registerMockedHttpURLLoad("viewport/viewport-13.html");
331 331
332 FrameTestHelpers::WebViewHelper webViewHelper; 332 FrameTestHelpers::WebViewHelper webViewHelper;
333 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-13.html", tru e, 0, 0, setViewportSettings); 333 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-13.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
334 334
335 Page* page = webViewHelper.webViewImpl()->page(); 335 Page* page = webViewHelper.webViewImpl()->page();
336 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 336 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
337 337
338 EXPECT_EQ(1280, constraints.layoutSize.width()); 338 EXPECT_EQ(1280, constraints.layoutSize.width());
339 EXPECT_EQ(1408, constraints.layoutSize.height()); 339 EXPECT_EQ(1408, constraints.layoutSize.height());
340 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 340 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
341 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 341 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
342 EXPECT_NEAR(0.5f, constraints.maximumScale, 0.01f); 342 EXPECT_NEAR(0.5f, constraints.maximumScale, 0.01f);
343 EXPECT_TRUE(page->viewportDescription().userZoom); 343 EXPECT_TRUE(page->viewportDescription().userZoom);
344 } 344 }
345 345
346 TEST_F(ViewportTest, viewport14) 346 TEST_F(ViewportTest, viewport14)
347 { 347 {
348 registerMockedHttpURLLoad("viewport/viewport-14.html"); 348 registerMockedHttpURLLoad("viewport/viewport-14.html");
349 349
350 FrameTestHelpers::WebViewHelper webViewHelper; 350 FrameTestHelpers::WebViewHelper webViewHelper;
351 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-14.html", tru e, 0, 0, setViewportSettings); 351 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-14.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
352 352
353 Page* page = webViewHelper.webViewImpl()->page(); 353 Page* page = webViewHelper.webViewImpl()->page();
354 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 354 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
355 355
356 EXPECT_EQ(320, constraints.layoutSize.width()); 356 EXPECT_EQ(320, constraints.layoutSize.width());
357 EXPECT_EQ(352, constraints.layoutSize.height()); 357 EXPECT_EQ(352, constraints.layoutSize.height());
358 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 358 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
359 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 359 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
360 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f); 360 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f);
361 EXPECT_TRUE(page->viewportDescription().userZoom); 361 EXPECT_TRUE(page->viewportDescription().userZoom);
362 } 362 }
363 363
364 TEST_F(ViewportTest, viewport15) 364 TEST_F(ViewportTest, viewport15)
365 { 365 {
366 registerMockedHttpURLLoad("viewport/viewport-15.html"); 366 registerMockedHttpURLLoad("viewport/viewport-15.html");
367 367
368 FrameTestHelpers::WebViewHelper webViewHelper; 368 FrameTestHelpers::WebViewHelper webViewHelper;
369 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-15.html", tru e, 0, 0, setViewportSettings); 369 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-15.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
370 370
371 Page* page = webViewHelper.webViewImpl()->page(); 371 Page* page = webViewHelper.webViewImpl()->page();
372 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 372 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
373 373
374 EXPECT_EQ(980, constraints.layoutSize.width()); 374 EXPECT_EQ(980, constraints.layoutSize.width());
375 EXPECT_EQ(1078, constraints.layoutSize.height()); 375 EXPECT_EQ(1078, constraints.layoutSize.height());
376 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 376 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
377 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 377 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
378 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 378 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
379 EXPECT_TRUE(page->viewportDescription().userZoom); 379 EXPECT_TRUE(page->viewportDescription().userZoom);
380 } 380 }
381 381
382 TEST_F(ViewportTest, viewport16) 382 TEST_F(ViewportTest, viewport16)
383 { 383 {
384 registerMockedHttpURLLoad("viewport/viewport-16.html"); 384 registerMockedHttpURLLoad("viewport/viewport-16.html");
385 385
386 FrameTestHelpers::WebViewHelper webViewHelper; 386 FrameTestHelpers::WebViewHelper webViewHelper;
387 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-16.html", tru e, 0, 0, setViewportSettings); 387 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-16.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
388 388
389 Page* page = webViewHelper.webViewImpl()->page(); 389 Page* page = webViewHelper.webViewImpl()->page();
390 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 390 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
391 391
392 EXPECT_EQ(980, constraints.layoutSize.width()); 392 EXPECT_EQ(980, constraints.layoutSize.width());
393 EXPECT_EQ(1078, constraints.layoutSize.height()); 393 EXPECT_EQ(1078, constraints.layoutSize.height());
394 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 394 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
395 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 395 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
396 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 396 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
397 EXPECT_TRUE(page->viewportDescription().userZoom); 397 EXPECT_TRUE(page->viewportDescription().userZoom);
398 } 398 }
399 399
400 TEST_F(ViewportTest, viewport17) 400 TEST_F(ViewportTest, viewport17)
401 { 401 {
402 registerMockedHttpURLLoad("viewport/viewport-17.html"); 402 registerMockedHttpURLLoad("viewport/viewport-17.html");
403 403
404 FrameTestHelpers::WebViewHelper webViewHelper; 404 FrameTestHelpers::WebViewHelper webViewHelper;
405 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-17.html", tru e, 0, 0, setViewportSettings); 405 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-17.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
406 406
407 Page* page = webViewHelper.webViewImpl()->page(); 407 Page* page = webViewHelper.webViewImpl()->page();
408 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 408 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
409 409
410 EXPECT_EQ(980, constraints.layoutSize.width()); 410 EXPECT_EQ(980, constraints.layoutSize.width());
411 EXPECT_EQ(1078, constraints.layoutSize.height()); 411 EXPECT_EQ(1078, constraints.layoutSize.height());
412 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 412 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
413 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 413 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
414 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 414 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
415 EXPECT_TRUE(page->viewportDescription().userZoom); 415 EXPECT_TRUE(page->viewportDescription().userZoom);
416 } 416 }
417 417
418 TEST_F(ViewportTest, viewport18) 418 TEST_F(ViewportTest, viewport18)
419 { 419 {
420 registerMockedHttpURLLoad("viewport/viewport-18.html"); 420 registerMockedHttpURLLoad("viewport/viewport-18.html");
421 421
422 FrameTestHelpers::WebViewHelper webViewHelper; 422 FrameTestHelpers::WebViewHelper webViewHelper;
423 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-18.html", tru e, 0, 0, setViewportSettings); 423 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-18.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
424 424
425 Page* page = webViewHelper.webViewImpl()->page(); 425 Page* page = webViewHelper.webViewImpl()->page();
426 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 426 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
427 427
428 EXPECT_EQ(64, constraints.layoutSize.width()); 428 EXPECT_EQ(64, constraints.layoutSize.width());
429 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 429 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
430 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 430 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
431 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 431 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
432 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 432 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
433 EXPECT_TRUE(page->viewportDescription().userZoom); 433 EXPECT_TRUE(page->viewportDescription().userZoom);
434 } 434 }
435 435
436 TEST_F(ViewportTest, viewport19) 436 TEST_F(ViewportTest, viewport19)
437 { 437 {
438 registerMockedHttpURLLoad("viewport/viewport-19.html"); 438 registerMockedHttpURLLoad("viewport/viewport-19.html");
439 439
440 FrameTestHelpers::WebViewHelper webViewHelper; 440 FrameTestHelpers::WebViewHelper webViewHelper;
441 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-19.html", tru e, 0, 0, setViewportSettings); 441 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-19.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
442 442
443 Page* page = webViewHelper.webViewImpl()->page(); 443 Page* page = webViewHelper.webViewImpl()->page();
444 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 444 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
445 445
446 EXPECT_EQ(160, constraints.layoutSize.width()); 446 EXPECT_EQ(160, constraints.layoutSize.width());
447 EXPECT_EQ(176, constraints.layoutSize.height()); 447 EXPECT_EQ(176, constraints.layoutSize.height());
448 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f); 448 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f);
449 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f); 449 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f);
450 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 450 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
451 EXPECT_TRUE(page->viewportDescription().userZoom); 451 EXPECT_TRUE(page->viewportDescription().userZoom);
452 } 452 }
453 453
454 TEST_F(ViewportTest, viewport20) 454 TEST_F(ViewportTest, viewport20)
455 { 455 {
456 registerMockedHttpURLLoad("viewport/viewport-20.html"); 456 registerMockedHttpURLLoad("viewport/viewport-20.html");
457 457
458 FrameTestHelpers::WebViewHelper webViewHelper; 458 FrameTestHelpers::WebViewHelper webViewHelper;
459 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-20.html", tru e, 0, 0, setViewportSettings); 459 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-20.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
460 460
461 Page* page = webViewHelper.webViewImpl()->page(); 461 Page* page = webViewHelper.webViewImpl()->page();
462 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 462 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
463 463
464 EXPECT_EQ(980, constraints.layoutSize.width()); 464 EXPECT_EQ(980, constraints.layoutSize.width());
465 EXPECT_EQ(1078, constraints.layoutSize.height()); 465 EXPECT_EQ(1078, constraints.layoutSize.height());
466 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 466 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
467 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 467 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
468 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 468 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
469 EXPECT_TRUE(page->viewportDescription().userZoom); 469 EXPECT_TRUE(page->viewportDescription().userZoom);
470 } 470 }
471 471
472 TEST_F(ViewportTest, viewport21) 472 TEST_F(ViewportTest, viewport21)
473 { 473 {
474 registerMockedHttpURLLoad("viewport/viewport-21.html"); 474 registerMockedHttpURLLoad("viewport/viewport-21.html");
475 475
476 FrameTestHelpers::WebViewHelper webViewHelper; 476 FrameTestHelpers::WebViewHelper webViewHelper;
477 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-21.html", tru e, 0, 0, setViewportSettings); 477 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-21.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
478 478
479 Page* page = webViewHelper.webViewImpl()->page(); 479 Page* page = webViewHelper.webViewImpl()->page();
480 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 480 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
481 481
482 EXPECT_EQ(980, constraints.layoutSize.width()); 482 EXPECT_EQ(980, constraints.layoutSize.width());
483 EXPECT_EQ(1078, constraints.layoutSize.height()); 483 EXPECT_EQ(1078, constraints.layoutSize.height());
484 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 484 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
485 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 485 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
486 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 486 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
487 EXPECT_TRUE(page->viewportDescription().userZoom); 487 EXPECT_TRUE(page->viewportDescription().userZoom);
488 } 488 }
489 489
490 TEST_F(ViewportTest, viewport22) 490 TEST_F(ViewportTest, viewport22)
491 { 491 {
492 registerMockedHttpURLLoad("viewport/viewport-22.html"); 492 registerMockedHttpURLLoad("viewport/viewport-22.html");
493 493
494 FrameTestHelpers::WebViewHelper webViewHelper; 494 FrameTestHelpers::WebViewHelper webViewHelper;
495 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-22.html", tru e, 0, 0, setViewportSettings); 495 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-22.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
496 496
497 Page* page = webViewHelper.webViewImpl()->page(); 497 Page* page = webViewHelper.webViewImpl()->page();
498 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 498 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
499 499
500 EXPECT_EQ(980, constraints.layoutSize.width()); 500 EXPECT_EQ(980, constraints.layoutSize.width());
501 EXPECT_EQ(1078, constraints.layoutSize.height()); 501 EXPECT_EQ(1078, constraints.layoutSize.height());
502 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 502 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
503 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 503 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
504 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 504 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
505 EXPECT_TRUE(page->viewportDescription().userZoom); 505 EXPECT_TRUE(page->viewportDescription().userZoom);
506 } 506 }
507 507
508 TEST_F(ViewportTest, viewport23) 508 TEST_F(ViewportTest, viewport23)
509 { 509 {
510 registerMockedHttpURLLoad("viewport/viewport-23.html"); 510 registerMockedHttpURLLoad("viewport/viewport-23.html");
511 511
512 FrameTestHelpers::WebViewHelper webViewHelper; 512 FrameTestHelpers::WebViewHelper webViewHelper;
513 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-23.html", tru e, 0, 0, setViewportSettings); 513 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-23.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
514 514
515 Page* page = webViewHelper.webViewImpl()->page(); 515 Page* page = webViewHelper.webViewImpl()->page();
516 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 516 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
517 517
518 EXPECT_EQ(980, constraints.layoutSize.width()); 518 EXPECT_EQ(980, constraints.layoutSize.width());
519 EXPECT_EQ(1078, constraints.layoutSize.height()); 519 EXPECT_EQ(1078, constraints.layoutSize.height());
520 EXPECT_NEAR(3.0f, constraints.initialScale, 0.01f); 520 EXPECT_NEAR(3.0f, constraints.initialScale, 0.01f);
521 EXPECT_NEAR(3.0f, constraints.minimumScale, 0.01f); 521 EXPECT_NEAR(3.0f, constraints.minimumScale, 0.01f);
522 EXPECT_NEAR(3.0f, constraints.maximumScale, 0.01f); 522 EXPECT_NEAR(3.0f, constraints.maximumScale, 0.01f);
523 EXPECT_TRUE(page->viewportDescription().userZoom); 523 EXPECT_TRUE(page->viewportDescription().userZoom);
524 } 524 }
525 525
526 TEST_F(ViewportTest, viewport24) 526 TEST_F(ViewportTest, viewport24)
527 { 527 {
528 registerMockedHttpURLLoad("viewport/viewport-24.html"); 528 registerMockedHttpURLLoad("viewport/viewport-24.html");
529 529
530 FrameTestHelpers::WebViewHelper webViewHelper; 530 FrameTestHelpers::WebViewHelper webViewHelper;
531 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-24.html", tru e, 0, 0, setViewportSettings); 531 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-24.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
532 532
533 Page* page = webViewHelper.webViewImpl()->page(); 533 Page* page = webViewHelper.webViewImpl()->page();
534 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 534 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
535 535
536 EXPECT_EQ(980, constraints.layoutSize.width()); 536 EXPECT_EQ(980, constraints.layoutSize.width());
537 EXPECT_EQ(1078, constraints.layoutSize.height()); 537 EXPECT_EQ(1078, constraints.layoutSize.height());
538 EXPECT_NEAR(4.0f, constraints.initialScale, 0.01f); 538 EXPECT_NEAR(4.0f, constraints.initialScale, 0.01f);
539 EXPECT_NEAR(4.0f, constraints.minimumScale, 0.01f); 539 EXPECT_NEAR(4.0f, constraints.minimumScale, 0.01f);
540 EXPECT_NEAR(4.0f, constraints.maximumScale, 0.01f); 540 EXPECT_NEAR(4.0f, constraints.maximumScale, 0.01f);
541 EXPECT_TRUE(page->viewportDescription().userZoom); 541 EXPECT_TRUE(page->viewportDescription().userZoom);
542 } 542 }
543 543
544 TEST_F(ViewportTest, viewport25) 544 TEST_F(ViewportTest, viewport25)
545 { 545 {
546 registerMockedHttpURLLoad("viewport/viewport-25.html"); 546 registerMockedHttpURLLoad("viewport/viewport-25.html");
547 547
548 FrameTestHelpers::WebViewHelper webViewHelper; 548 FrameTestHelpers::WebViewHelper webViewHelper;
549 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-25.html", tru e, 0, 0, setViewportSettings); 549 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-25.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
550 550
551 Page* page = webViewHelper.webViewImpl()->page(); 551 Page* page = webViewHelper.webViewImpl()->page();
552 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 552 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
553 553
554 EXPECT_EQ(980, constraints.layoutSize.width()); 554 EXPECT_EQ(980, constraints.layoutSize.width());
555 EXPECT_EQ(1078, constraints.layoutSize.height()); 555 EXPECT_EQ(1078, constraints.layoutSize.height());
556 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 556 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
557 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 557 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
558 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 558 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
559 EXPECT_TRUE(page->viewportDescription().userZoom); 559 EXPECT_TRUE(page->viewportDescription().userZoom);
560 } 560 }
561 561
562 TEST_F(ViewportTest, viewport26) 562 TEST_F(ViewportTest, viewport26)
563 { 563 {
564 registerMockedHttpURLLoad("viewport/viewport-26.html"); 564 registerMockedHttpURLLoad("viewport/viewport-26.html");
565 565
566 FrameTestHelpers::WebViewHelper webViewHelper; 566 FrameTestHelpers::WebViewHelper webViewHelper;
567 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-26.html", tru e, 0, 0, setViewportSettings); 567 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-26.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
568 568
569 Page* page = webViewHelper.webViewImpl()->page(); 569 Page* page = webViewHelper.webViewImpl()->page();
570 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 570 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
571 571
572 EXPECT_EQ(980, constraints.layoutSize.width()); 572 EXPECT_EQ(980, constraints.layoutSize.width());
573 EXPECT_EQ(1078, constraints.layoutSize.height()); 573 EXPECT_EQ(1078, constraints.layoutSize.height());
574 EXPECT_NEAR(8.0f, constraints.initialScale, 0.01f); 574 EXPECT_NEAR(8.0f, constraints.initialScale, 0.01f);
575 EXPECT_NEAR(8.0f, constraints.minimumScale, 0.01f); 575 EXPECT_NEAR(8.0f, constraints.minimumScale, 0.01f);
576 EXPECT_NEAR(9.0f, constraints.maximumScale, 0.01f); 576 EXPECT_NEAR(9.0f, constraints.maximumScale, 0.01f);
577 EXPECT_TRUE(page->viewportDescription().userZoom); 577 EXPECT_TRUE(page->viewportDescription().userZoom);
578 } 578 }
579 579
580 TEST_F(ViewportTest, viewport27) 580 TEST_F(ViewportTest, viewport27)
581 { 581 {
582 registerMockedHttpURLLoad("viewport/viewport-27.html"); 582 registerMockedHttpURLLoad("viewport/viewport-27.html");
583 583
584 FrameTestHelpers::WebViewHelper webViewHelper; 584 FrameTestHelpers::WebViewHelper webViewHelper;
585 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-27.html", tru e, 0, 0, setViewportSettings); 585 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-27.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
586 586
587 Page* page = webViewHelper.webViewImpl()->page(); 587 Page* page = webViewHelper.webViewImpl()->page();
588 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 588 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
589 589
590 EXPECT_EQ(980, constraints.layoutSize.width()); 590 EXPECT_EQ(980, constraints.layoutSize.width());
591 EXPECT_EQ(1078, constraints.layoutSize.height()); 591 EXPECT_EQ(1078, constraints.layoutSize.height());
592 EXPECT_NEAR(0.32f, constraints.initialScale, 0.01f); 592 EXPECT_NEAR(0.32f, constraints.initialScale, 0.01f);
593 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f); 593 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f);
594 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 594 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
595 EXPECT_TRUE(page->viewportDescription().userZoom); 595 EXPECT_TRUE(page->viewportDescription().userZoom);
596 } 596 }
597 597
598 TEST_F(ViewportTest, viewport28) 598 TEST_F(ViewportTest, viewport28)
599 { 599 {
600 registerMockedHttpURLLoad("viewport/viewport-28.html"); 600 registerMockedHttpURLLoad("viewport/viewport-28.html");
601 601
602 FrameTestHelpers::WebViewHelper webViewHelper; 602 FrameTestHelpers::WebViewHelper webViewHelper;
603 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-28.html", tru e, 0, 0, setViewportSettings); 603 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-28.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
604 604
605 Page* page = webViewHelper.webViewImpl()->page(); 605 Page* page = webViewHelper.webViewImpl()->page();
606 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 606 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
607 607
608 EXPECT_EQ(352, constraints.layoutSize.width()); 608 EXPECT_EQ(352, constraints.layoutSize.width());
609 EXPECT_NEAR(387.2, constraints.layoutSize.height(), 0.01); 609 EXPECT_NEAR(387.2, constraints.layoutSize.height(), 0.01);
610 EXPECT_NEAR(0.91f, constraints.initialScale, 0.01f); 610 EXPECT_NEAR(0.91f, constraints.initialScale, 0.01f);
611 EXPECT_NEAR(0.91f, constraints.minimumScale, 0.01f); 611 EXPECT_NEAR(0.91f, constraints.minimumScale, 0.01f);
612 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 612 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
613 EXPECT_TRUE(page->viewportDescription().userZoom); 613 EXPECT_TRUE(page->viewportDescription().userZoom);
614 } 614 }
615 615
616 TEST_F(ViewportTest, viewport29) 616 TEST_F(ViewportTest, viewport29)
617 { 617 {
618 registerMockedHttpURLLoad("viewport/viewport-29.html"); 618 registerMockedHttpURLLoad("viewport/viewport-29.html");
619 619
620 FrameTestHelpers::WebViewHelper webViewHelper; 620 FrameTestHelpers::WebViewHelper webViewHelper;
621 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-29.html", tru e, 0, 0, setViewportSettings); 621 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-29.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
622 622
623 Page* page = webViewHelper.webViewImpl()->page(); 623 Page* page = webViewHelper.webViewImpl()->page();
624 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 624 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
625 625
626 EXPECT_EQ(700, constraints.layoutSize.width()); 626 EXPECT_EQ(700, constraints.layoutSize.width());
627 EXPECT_EQ(770, constraints.layoutSize.height()); 627 EXPECT_EQ(770, constraints.layoutSize.height());
628 EXPECT_NEAR(0.46f, constraints.initialScale, 0.01f); 628 EXPECT_NEAR(0.46f, constraints.initialScale, 0.01f);
629 EXPECT_NEAR(0.46f, constraints.minimumScale, 0.01f); 629 EXPECT_NEAR(0.46f, constraints.minimumScale, 0.01f);
630 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 630 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
631 EXPECT_TRUE(page->viewportDescription().userZoom); 631 EXPECT_TRUE(page->viewportDescription().userZoom);
632 } 632 }
633 633
634 TEST_F(ViewportTest, viewport30) 634 TEST_F(ViewportTest, viewport30)
635 { 635 {
636 registerMockedHttpURLLoad("viewport/viewport-30.html"); 636 registerMockedHttpURLLoad("viewport/viewport-30.html");
637 637
638 FrameTestHelpers::WebViewHelper webViewHelper; 638 FrameTestHelpers::WebViewHelper webViewHelper;
639 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-30.html", tru e, 0, 0, setViewportSettings); 639 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-30.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
640 640
641 Page* page = webViewHelper.webViewImpl()->page(); 641 Page* page = webViewHelper.webViewImpl()->page();
642 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 642 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
643 643
644 EXPECT_EQ(200, constraints.layoutSize.width()); 644 EXPECT_EQ(200, constraints.layoutSize.width());
645 EXPECT_EQ(220, constraints.layoutSize.height()); 645 EXPECT_EQ(220, constraints.layoutSize.height());
646 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f); 646 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f);
647 EXPECT_NEAR(1.6f, constraints.minimumScale, 0.01f); 647 EXPECT_NEAR(1.6f, constraints.minimumScale, 0.01f);
648 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 648 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
649 EXPECT_TRUE(page->viewportDescription().userZoom); 649 EXPECT_TRUE(page->viewportDescription().userZoom);
650 } 650 }
651 651
652 TEST_F(ViewportTest, viewport31) 652 TEST_F(ViewportTest, viewport31)
653 { 653 {
654 registerMockedHttpURLLoad("viewport/viewport-31.html"); 654 registerMockedHttpURLLoad("viewport/viewport-31.html");
655 655
656 FrameTestHelpers::WebViewHelper webViewHelper; 656 FrameTestHelpers::WebViewHelper webViewHelper;
657 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-31.html", tru e, 0, 0, setViewportSettings); 657 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-31.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
658 658
659 Page* page = webViewHelper.webViewImpl()->page(); 659 Page* page = webViewHelper.webViewImpl()->page();
660 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 660 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
661 661
662 EXPECT_EQ(980, constraints.layoutSize.width()); 662 EXPECT_EQ(980, constraints.layoutSize.width());
663 EXPECT_EQ(700, constraints.layoutSize.height()); 663 EXPECT_EQ(700, constraints.layoutSize.height());
664 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 664 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
665 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 665 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
666 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 666 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
667 EXPECT_TRUE(page->viewportDescription().userZoom); 667 EXPECT_TRUE(page->viewportDescription().userZoom);
668 } 668 }
669 669
670 TEST_F(ViewportTest, viewport32) 670 TEST_F(ViewportTest, viewport32)
671 { 671 {
672 registerMockedHttpURLLoad("viewport/viewport-32.html"); 672 registerMockedHttpURLLoad("viewport/viewport-32.html");
673 673
674 FrameTestHelpers::WebViewHelper webViewHelper; 674 FrameTestHelpers::WebViewHelper webViewHelper;
675 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-32.html", tru e, 0, 0, setViewportSettings); 675 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-32.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
676 676
677 Page* page = webViewHelper.webViewImpl()->page(); 677 Page* page = webViewHelper.webViewImpl()->page();
678 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 678 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
679 679
680 EXPECT_EQ(980, constraints.layoutSize.width()); 680 EXPECT_EQ(980, constraints.layoutSize.width());
681 EXPECT_EQ(200, constraints.layoutSize.height()); 681 EXPECT_EQ(200, constraints.layoutSize.height());
682 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 682 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
683 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 683 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
684 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 684 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
685 EXPECT_TRUE(page->viewportDescription().userZoom); 685 EXPECT_TRUE(page->viewportDescription().userZoom);
686 } 686 }
687 687
688 TEST_F(ViewportTest, viewport33) 688 TEST_F(ViewportTest, viewport33)
689 { 689 {
690 registerMockedHttpURLLoad("viewport/viewport-33.html"); 690 registerMockedHttpURLLoad("viewport/viewport-33.html");
691 691
692 FrameTestHelpers::WebViewHelper webViewHelper; 692 FrameTestHelpers::WebViewHelper webViewHelper;
693 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-33.html", tru e, 0, 0, setViewportSettings); 693 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-33.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
694 694
695 Page* page = webViewHelper.webViewImpl()->page(); 695 Page* page = webViewHelper.webViewImpl()->page();
696 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 696 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
697 697
698 EXPECT_EQ(320, constraints.layoutSize.width()); 698 EXPECT_EQ(320, constraints.layoutSize.width());
699 EXPECT_EQ(352, constraints.layoutSize.height()); 699 EXPECT_EQ(352, constraints.layoutSize.height());
700 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f); 700 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f);
701 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 701 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
702 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 702 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
703 EXPECT_TRUE(page->viewportDescription().userZoom); 703 EXPECT_TRUE(page->viewportDescription().userZoom);
704 } 704 }
705 705
706 TEST_F(ViewportTest, viewport34) 706 TEST_F(ViewportTest, viewport34)
707 { 707 {
708 registerMockedHttpURLLoad("viewport/viewport-34.html"); 708 registerMockedHttpURLLoad("viewport/viewport-34.html");
709 709
710 FrameTestHelpers::WebViewHelper webViewHelper; 710 FrameTestHelpers::WebViewHelper webViewHelper;
711 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-34.html", tru e, 0, 0, setViewportSettings); 711 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-34.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
712 712
713 Page* page = webViewHelper.webViewImpl()->page(); 713 Page* page = webViewHelper.webViewImpl()->page();
714 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 714 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
715 715
716 EXPECT_EQ(640, constraints.layoutSize.width()); 716 EXPECT_EQ(640, constraints.layoutSize.width());
717 EXPECT_EQ(704, constraints.layoutSize.height()); 717 EXPECT_EQ(704, constraints.layoutSize.height());
718 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 718 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
719 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f); 719 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f);
720 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 720 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
721 EXPECT_TRUE(page->viewportDescription().userZoom); 721 EXPECT_TRUE(page->viewportDescription().userZoom);
722 } 722 }
723 723
724 TEST_F(ViewportTest, viewport35) 724 TEST_F(ViewportTest, viewport35)
725 { 725 {
726 registerMockedHttpURLLoad("viewport/viewport-35.html"); 726 registerMockedHttpURLLoad("viewport/viewport-35.html");
727 727
728 FrameTestHelpers::WebViewHelper webViewHelper; 728 FrameTestHelpers::WebViewHelper webViewHelper;
729 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-35.html", tru e, 0, 0, setViewportSettings); 729 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-35.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
730 730
731 Page* page = webViewHelper.webViewImpl()->page(); 731 Page* page = webViewHelper.webViewImpl()->page();
732 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 732 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
733 733
734 EXPECT_EQ(1280, constraints.layoutSize.width()); 734 EXPECT_EQ(1280, constraints.layoutSize.width());
735 EXPECT_EQ(1408, constraints.layoutSize.height()); 735 EXPECT_EQ(1408, constraints.layoutSize.height());
736 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 736 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
737 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 737 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
738 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 738 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
739 EXPECT_TRUE(page->viewportDescription().userZoom); 739 EXPECT_TRUE(page->viewportDescription().userZoom);
740 } 740 }
741 741
742 TEST_F(ViewportTest, viewport36) 742 TEST_F(ViewportTest, viewport36)
743 { 743 {
744 registerMockedHttpURLLoad("viewport/viewport-36.html"); 744 registerMockedHttpURLLoad("viewport/viewport-36.html");
745 745
746 FrameTestHelpers::WebViewHelper webViewHelper; 746 FrameTestHelpers::WebViewHelper webViewHelper;
747 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-36.html", tru e, 0, 0, setViewportSettings); 747 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-36.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
748 748
749 Page* page = webViewHelper.webViewImpl()->page(); 749 Page* page = webViewHelper.webViewImpl()->page();
750 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 750 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
751 751
752 EXPECT_NEAR(636.36, constraints.layoutSize.width(), 0.01f); 752 EXPECT_NEAR(636.36, constraints.layoutSize.width(), 0.01f);
753 EXPECT_EQ(700, constraints.layoutSize.height()); 753 EXPECT_EQ(700, constraints.layoutSize.height());
754 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f); 754 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f);
755 EXPECT_NEAR(0.50f, constraints.minimumScale, 0.01f); 755 EXPECT_NEAR(0.50f, constraints.minimumScale, 0.01f);
756 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 756 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
757 EXPECT_TRUE(page->viewportDescription().userZoom); 757 EXPECT_TRUE(page->viewportDescription().userZoom);
758 } 758 }
759 759
760 TEST_F(ViewportTest, viewport37) 760 TEST_F(ViewportTest, viewport37)
761 { 761 {
762 registerMockedHttpURLLoad("viewport/viewport-37.html"); 762 registerMockedHttpURLLoad("viewport/viewport-37.html");
763 763
764 FrameTestHelpers::WebViewHelper webViewHelper; 764 FrameTestHelpers::WebViewHelper webViewHelper;
765 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-37.html", tru e, 0, 0, setViewportSettings); 765 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-37.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
766 766
767 Page* page = webViewHelper.webViewImpl()->page(); 767 Page* page = webViewHelper.webViewImpl()->page();
768 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 768 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
769 769
770 EXPECT_EQ(320, constraints.layoutSize.width()); 770 EXPECT_EQ(320, constraints.layoutSize.width());
771 EXPECT_EQ(352, constraints.layoutSize.height()); 771 EXPECT_EQ(352, constraints.layoutSize.height());
772 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 772 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
773 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 773 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
774 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 774 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
775 EXPECT_TRUE(page->viewportDescription().userZoom); 775 EXPECT_TRUE(page->viewportDescription().userZoom);
776 } 776 }
777 777
778 TEST_F(ViewportTest, viewport38) 778 TEST_F(ViewportTest, viewport38)
779 { 779 {
780 registerMockedHttpURLLoad("viewport/viewport-38.html"); 780 registerMockedHttpURLLoad("viewport/viewport-38.html");
781 781
782 FrameTestHelpers::WebViewHelper webViewHelper; 782 FrameTestHelpers::WebViewHelper webViewHelper;
783 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-38.html", tru e, 0, 0, setViewportSettings); 783 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-38.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
784 784
785 Page* page = webViewHelper.webViewImpl()->page(); 785 Page* page = webViewHelper.webViewImpl()->page();
786 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 786 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
787 787
788 EXPECT_EQ(640, constraints.layoutSize.width()); 788 EXPECT_EQ(640, constraints.layoutSize.width());
789 EXPECT_EQ(704, constraints.layoutSize.height()); 789 EXPECT_EQ(704, constraints.layoutSize.height());
790 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 790 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
791 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f); 791 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f);
792 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 792 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
793 EXPECT_TRUE(page->viewportDescription().userZoom); 793 EXPECT_TRUE(page->viewportDescription().userZoom);
794 } 794 }
795 795
796 TEST_F(ViewportTest, viewport39) 796 TEST_F(ViewportTest, viewport39)
797 { 797 {
798 registerMockedHttpURLLoad("viewport/viewport-39.html"); 798 registerMockedHttpURLLoad("viewport/viewport-39.html");
799 799
800 FrameTestHelpers::WebViewHelper webViewHelper; 800 FrameTestHelpers::WebViewHelper webViewHelper;
801 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-39.html", tru e, 0, 0, setViewportSettings); 801 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-39.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
802 802
803 Page* page = webViewHelper.webViewImpl()->page(); 803 Page* page = webViewHelper.webViewImpl()->page();
804 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 804 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
805 805
806 EXPECT_EQ(200, constraints.layoutSize.width()); 806 EXPECT_EQ(200, constraints.layoutSize.width());
807 EXPECT_EQ(700, constraints.layoutSize.height()); 807 EXPECT_EQ(700, constraints.layoutSize.height());
808 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f); 808 EXPECT_NEAR(1.6f, constraints.initialScale, 0.01f);
809 EXPECT_NEAR(1.6f, constraints.minimumScale, 0.01f); 809 EXPECT_NEAR(1.6f, constraints.minimumScale, 0.01f);
810 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 810 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
811 EXPECT_TRUE(page->viewportDescription().userZoom); 811 EXPECT_TRUE(page->viewportDescription().userZoom);
812 } 812 }
813 813
814 TEST_F(ViewportTest, viewport40) 814 TEST_F(ViewportTest, viewport40)
815 { 815 {
816 registerMockedHttpURLLoad("viewport/viewport-40.html"); 816 registerMockedHttpURLLoad("viewport/viewport-40.html");
817 817
818 FrameTestHelpers::WebViewHelper webViewHelper; 818 FrameTestHelpers::WebViewHelper webViewHelper;
819 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-40.html", tru e, 0, 0, setViewportSettings); 819 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-40.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
820 820
821 Page* page = webViewHelper.webViewImpl()->page(); 821 Page* page = webViewHelper.webViewImpl()->page();
822 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 822 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
823 823
824 EXPECT_EQ(700, constraints.layoutSize.width()); 824 EXPECT_EQ(700, constraints.layoutSize.width());
825 EXPECT_EQ(352, constraints.layoutSize.height()); 825 EXPECT_EQ(352, constraints.layoutSize.height());
826 EXPECT_NEAR(0.46f, constraints.initialScale, 0.01f); 826 EXPECT_NEAR(0.46f, constraints.initialScale, 0.01f);
827 EXPECT_NEAR(0.46f, constraints.minimumScale, 0.01f); 827 EXPECT_NEAR(0.46f, constraints.minimumScale, 0.01f);
828 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 828 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
829 EXPECT_TRUE(page->viewportDescription().userZoom); 829 EXPECT_TRUE(page->viewportDescription().userZoom);
830 } 830 }
831 831
832 TEST_F(ViewportTest, viewport41) 832 TEST_F(ViewportTest, viewport41)
833 { 833 {
834 registerMockedHttpURLLoad("viewport/viewport-41.html"); 834 registerMockedHttpURLLoad("viewport/viewport-41.html");
835 835
836 FrameTestHelpers::WebViewHelper webViewHelper; 836 FrameTestHelpers::WebViewHelper webViewHelper;
837 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-41.html", tru e, 0, 0, setViewportSettings); 837 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-41.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
838 838
839 Page* page = webViewHelper.webViewImpl()->page(); 839 Page* page = webViewHelper.webViewImpl()->page();
840 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 840 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
841 841
842 EXPECT_EQ(1000, constraints.layoutSize.width()); 842 EXPECT_EQ(1000, constraints.layoutSize.width());
843 EXPECT_EQ(704, constraints.layoutSize.height()); 843 EXPECT_EQ(704, constraints.layoutSize.height());
844 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 844 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
845 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f); 845 EXPECT_NEAR(0.32f, constraints.minimumScale, 0.01f);
846 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 846 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
847 EXPECT_TRUE(page->viewportDescription().userZoom); 847 EXPECT_TRUE(page->viewportDescription().userZoom);
848 } 848 }
849 849
850 TEST_F(ViewportTest, viewport42) 850 TEST_F(ViewportTest, viewport42)
851 { 851 {
852 registerMockedHttpURLLoad("viewport/viewport-42.html"); 852 registerMockedHttpURLLoad("viewport/viewport-42.html");
853 853
854 FrameTestHelpers::WebViewHelper webViewHelper; 854 FrameTestHelpers::WebViewHelper webViewHelper;
855 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-42.html", tru e, 0, 0, setViewportSettings); 855 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-42.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
856 856
857 Page* page = webViewHelper.webViewImpl()->page(); 857 Page* page = webViewHelper.webViewImpl()->page();
858 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 858 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
859 859
860 EXPECT_EQ(320, constraints.layoutSize.width()); 860 EXPECT_EQ(320, constraints.layoutSize.width());
861 EXPECT_EQ(1000, constraints.layoutSize.height()); 861 EXPECT_EQ(1000, constraints.layoutSize.height());
862 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f); 862 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f);
863 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 863 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
864 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 864 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
865 EXPECT_TRUE(page->viewportDescription().userZoom); 865 EXPECT_TRUE(page->viewportDescription().userZoom);
866 } 866 }
867 867
868 TEST_F(ViewportTest, viewport43) 868 TEST_F(ViewportTest, viewport43)
869 { 869 {
870 registerMockedHttpURLLoad("viewport/viewport-43.html"); 870 registerMockedHttpURLLoad("viewport/viewport-43.html");
871 871
872 FrameTestHelpers::WebViewHelper webViewHelper; 872 FrameTestHelpers::WebViewHelper webViewHelper;
873 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-43.html", tru e, 0, 0, setViewportSettings); 873 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-43.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
874 874
875 Page* page = webViewHelper.webViewImpl()->page(); 875 Page* page = webViewHelper.webViewImpl()->page();
876 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 876 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
877 877
878 EXPECT_EQ(64, constraints.layoutSize.width()); 878 EXPECT_EQ(64, constraints.layoutSize.width());
879 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 879 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
880 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 880 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
881 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 881 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
882 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 882 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
883 EXPECT_TRUE(page->viewportDescription().userZoom); 883 EXPECT_TRUE(page->viewportDescription().userZoom);
884 } 884 }
885 885
886 TEST_F(ViewportTest, viewport44) 886 TEST_F(ViewportTest, viewport44)
887 { 887 {
888 registerMockedHttpURLLoad("viewport/viewport-44.html"); 888 registerMockedHttpURLLoad("viewport/viewport-44.html");
889 889
890 FrameTestHelpers::WebViewHelper webViewHelper; 890 FrameTestHelpers::WebViewHelper webViewHelper;
891 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-44.html", tru e, 0, 0, setViewportSettings); 891 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-44.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
892 892
893 Page* page = webViewHelper.webViewImpl()->page(); 893 Page* page = webViewHelper.webViewImpl()->page();
894 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 894 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
895 895
896 EXPECT_EQ(10000, constraints.layoutSize.width()); 896 EXPECT_EQ(10000, constraints.layoutSize.width());
897 EXPECT_EQ(10000, constraints.layoutSize.height()); 897 EXPECT_EQ(10000, constraints.layoutSize.height());
898 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 898 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
899 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 899 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
900 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 900 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
901 EXPECT_TRUE(page->viewportDescription().userZoom); 901 EXPECT_TRUE(page->viewportDescription().userZoom);
902 } 902 }
903 903
904 TEST_F(ViewportTest, viewport45) 904 TEST_F(ViewportTest, viewport45)
905 { 905 {
906 registerMockedHttpURLLoad("viewport/viewport-45.html"); 906 registerMockedHttpURLLoad("viewport/viewport-45.html");
907 907
908 FrameTestHelpers::WebViewHelper webViewHelper; 908 FrameTestHelpers::WebViewHelper webViewHelper;
909 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-45.html", tru e, 0, 0, setViewportSettings); 909 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-45.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
910 910
911 Page* page = webViewHelper.webViewImpl()->page(); 911 Page* page = webViewHelper.webViewImpl()->page();
912 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 912 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
913 913
914 EXPECT_EQ(3200, constraints.layoutSize.width()); 914 EXPECT_EQ(3200, constraints.layoutSize.width());
915 EXPECT_EQ(3520, constraints.layoutSize.height()); 915 EXPECT_EQ(3520, constraints.layoutSize.height());
916 EXPECT_NEAR(0.1f, constraints.initialScale, 0.01f); 916 EXPECT_NEAR(0.1f, constraints.initialScale, 0.01f);
917 EXPECT_NEAR(0.1f, constraints.minimumScale, 0.01f); 917 EXPECT_NEAR(0.1f, constraints.minimumScale, 0.01f);
918 EXPECT_NEAR(0.1f, constraints.maximumScale, 0.01f); 918 EXPECT_NEAR(0.1f, constraints.maximumScale, 0.01f);
919 EXPECT_TRUE(page->viewportDescription().userZoom); 919 EXPECT_TRUE(page->viewportDescription().userZoom);
920 } 920 }
921 921
922 TEST_F(ViewportTest, viewport46) 922 TEST_F(ViewportTest, viewport46)
923 { 923 {
924 registerMockedHttpURLLoad("viewport/viewport-46.html"); 924 registerMockedHttpURLLoad("viewport/viewport-46.html");
925 925
926 FrameTestHelpers::WebViewHelper webViewHelper; 926 FrameTestHelpers::WebViewHelper webViewHelper;
927 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-46.html", tru e, 0, 0, setViewportSettings); 927 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-46.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
928 928
929 Page* page = webViewHelper.webViewImpl()->page(); 929 Page* page = webViewHelper.webViewImpl()->page();
930 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 930 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
931 931
932 EXPECT_EQ(32, constraints.layoutSize.width()); 932 EXPECT_EQ(32, constraints.layoutSize.width());
933 EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01f); 933 EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01f);
934 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 934 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
935 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 935 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
936 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 936 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
937 EXPECT_TRUE(page->viewportDescription().userZoom); 937 EXPECT_TRUE(page->viewportDescription().userZoom);
938 } 938 }
939 939
940 TEST_F(ViewportTest, viewport47) 940 TEST_F(ViewportTest, viewport47)
941 { 941 {
942 registerMockedHttpURLLoad("viewport/viewport-47.html"); 942 registerMockedHttpURLLoad("viewport/viewport-47.html");
943 943
944 FrameTestHelpers::WebViewHelper webViewHelper; 944 FrameTestHelpers::WebViewHelper webViewHelper;
945 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-47.html", tru e, 0, 0, setViewportSettings); 945 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-47.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
946 946
947 Page* page = webViewHelper.webViewImpl()->page(); 947 Page* page = webViewHelper.webViewImpl()->page();
948 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 948 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
949 949
950 EXPECT_EQ(320, constraints.layoutSize.width()); 950 EXPECT_EQ(320, constraints.layoutSize.width());
951 EXPECT_EQ(3000, constraints.layoutSize.height()); 951 EXPECT_EQ(3000, constraints.layoutSize.height());
952 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 952 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
953 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 953 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
954 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 954 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
955 EXPECT_TRUE(page->viewportDescription().userZoom); 955 EXPECT_TRUE(page->viewportDescription().userZoom);
956 } 956 }
957 957
958 TEST_F(ViewportTest, viewport48) 958 TEST_F(ViewportTest, viewport48)
959 { 959 {
960 registerMockedHttpURLLoad("viewport/viewport-48.html"); 960 registerMockedHttpURLLoad("viewport/viewport-48.html");
961 961
962 FrameTestHelpers::WebViewHelper webViewHelper; 962 FrameTestHelpers::WebViewHelper webViewHelper;
963 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-48.html", tru e, 0, 0, setViewportSettings); 963 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-48.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
964 964
965 Page* page = webViewHelper.webViewImpl()->page(); 965 Page* page = webViewHelper.webViewImpl()->page();
966 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 966 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
967 967
968 EXPECT_EQ(3000, constraints.layoutSize.width()); 968 EXPECT_EQ(3000, constraints.layoutSize.width());
969 EXPECT_EQ(352, constraints.layoutSize.height()); 969 EXPECT_EQ(352, constraints.layoutSize.height());
970 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 970 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
971 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 971 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
972 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 972 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
973 EXPECT_TRUE(page->viewportDescription().userZoom); 973 EXPECT_TRUE(page->viewportDescription().userZoom);
974 } 974 }
975 975
976 TEST_F(ViewportTest, viewport49) 976 TEST_F(ViewportTest, viewport49)
977 { 977 {
978 registerMockedHttpURLLoad("viewport/viewport-49.html"); 978 registerMockedHttpURLLoad("viewport/viewport-49.html");
979 979
980 FrameTestHelpers::WebViewHelper webViewHelper; 980 FrameTestHelpers::WebViewHelper webViewHelper;
981 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-49.html", tru e, 0, 0, setViewportSettings); 981 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-49.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
982 982
983 Page* page = webViewHelper.webViewImpl()->page(); 983 Page* page = webViewHelper.webViewImpl()->page();
984 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 984 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
985 985
986 EXPECT_EQ(320, constraints.layoutSize.width()); 986 EXPECT_EQ(320, constraints.layoutSize.width());
987 EXPECT_EQ(352, constraints.layoutSize.height()); 987 EXPECT_EQ(352, constraints.layoutSize.height());
988 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 988 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
989 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 989 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
990 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 990 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
991 EXPECT_TRUE(page->viewportDescription().userZoom); 991 EXPECT_TRUE(page->viewportDescription().userZoom);
992 } 992 }
993 993
994 TEST_F(ViewportTest, viewport50) 994 TEST_F(ViewportTest, viewport50)
995 { 995 {
996 registerMockedHttpURLLoad("viewport/viewport-50.html"); 996 registerMockedHttpURLLoad("viewport/viewport-50.html");
997 997
998 FrameTestHelpers::WebViewHelper webViewHelper; 998 FrameTestHelpers::WebViewHelper webViewHelper;
999 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-50.html", tru e, 0, 0, setViewportSettings); 999 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-50.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1000 1000
1001 Page* page = webViewHelper.webViewImpl()->page(); 1001 Page* page = webViewHelper.webViewImpl()->page();
1002 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1002 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1003 1003
1004 EXPECT_EQ(980, constraints.layoutSize.width()); 1004 EXPECT_EQ(980, constraints.layoutSize.width());
1005 EXPECT_EQ(1078, constraints.layoutSize.height()); 1005 EXPECT_EQ(1078, constraints.layoutSize.height());
1006 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1006 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1007 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1007 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1008 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1008 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1009 EXPECT_TRUE(page->viewportDescription().userZoom); 1009 EXPECT_TRUE(page->viewportDescription().userZoom);
1010 } 1010 }
1011 1011
1012 TEST_F(ViewportTest, viewport51) 1012 TEST_F(ViewportTest, viewport51)
1013 { 1013 {
1014 registerMockedHttpURLLoad("viewport/viewport-51.html"); 1014 registerMockedHttpURLLoad("viewport/viewport-51.html");
1015 1015
1016 FrameTestHelpers::WebViewHelper webViewHelper; 1016 FrameTestHelpers::WebViewHelper webViewHelper;
1017 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-51.html", tru e, 0, 0, setViewportSettings); 1017 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-51.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1018 1018
1019 Page* page = webViewHelper.webViewImpl()->page(); 1019 Page* page = webViewHelper.webViewImpl()->page();
1020 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1020 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1021 1021
1022 EXPECT_EQ(980, constraints.layoutSize.width()); 1022 EXPECT_EQ(980, constraints.layoutSize.width());
1023 EXPECT_EQ(1078, constraints.layoutSize.height()); 1023 EXPECT_EQ(1078, constraints.layoutSize.height());
1024 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1024 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1025 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1025 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1026 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1026 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1027 EXPECT_TRUE(page->viewportDescription().userZoom); 1027 EXPECT_TRUE(page->viewportDescription().userZoom);
1028 } 1028 }
1029 1029
1030 TEST_F(ViewportTest, viewport52) 1030 TEST_F(ViewportTest, viewport52)
1031 { 1031 {
1032 registerMockedHttpURLLoad("viewport/viewport-52.html"); 1032 registerMockedHttpURLLoad("viewport/viewport-52.html");
1033 1033
1034 FrameTestHelpers::WebViewHelper webViewHelper; 1034 FrameTestHelpers::WebViewHelper webViewHelper;
1035 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-52.html", tru e, 0, 0, setViewportSettings); 1035 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-52.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1036 1036
1037 Page* page = webViewHelper.webViewImpl()->page(); 1037 Page* page = webViewHelper.webViewImpl()->page();
1038 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1038 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1039 1039
1040 EXPECT_EQ(64, constraints.layoutSize.width()); 1040 EXPECT_EQ(64, constraints.layoutSize.width());
1041 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1041 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1042 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1042 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1043 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1043 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1044 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1044 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1045 EXPECT_TRUE(page->viewportDescription().userZoom); 1045 EXPECT_TRUE(page->viewportDescription().userZoom);
1046 } 1046 }
1047 1047
1048 TEST_F(ViewportTest, viewport53) 1048 TEST_F(ViewportTest, viewport53)
1049 { 1049 {
1050 registerMockedHttpURLLoad("viewport/viewport-53.html"); 1050 registerMockedHttpURLLoad("viewport/viewport-53.html");
1051 1051
1052 FrameTestHelpers::WebViewHelper webViewHelper; 1052 FrameTestHelpers::WebViewHelper webViewHelper;
1053 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-53.html", tru e, 0, 0, setViewportSettings); 1053 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-53.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1054 1054
1055 Page* page = webViewHelper.webViewImpl()->page(); 1055 Page* page = webViewHelper.webViewImpl()->page();
1056 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1056 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1057 1057
1058 EXPECT_EQ(980, constraints.layoutSize.width()); 1058 EXPECT_EQ(980, constraints.layoutSize.width());
1059 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1059 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1060 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1060 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1061 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1061 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1062 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1062 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1063 EXPECT_TRUE(page->viewportDescription().userZoom); 1063 EXPECT_TRUE(page->viewportDescription().userZoom);
1064 } 1064 }
1065 1065
1066 TEST_F(ViewportTest, viewport54) 1066 TEST_F(ViewportTest, viewport54)
1067 { 1067 {
1068 registerMockedHttpURLLoad("viewport/viewport-54.html"); 1068 registerMockedHttpURLLoad("viewport/viewport-54.html");
1069 1069
1070 FrameTestHelpers::WebViewHelper webViewHelper; 1070 FrameTestHelpers::WebViewHelper webViewHelper;
1071 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-54.html", tru e, 0, 0, setViewportSettings); 1071 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-54.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1072 1072
1073 Page* page = webViewHelper.webViewImpl()->page(); 1073 Page* page = webViewHelper.webViewImpl()->page();
1074 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1074 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1075 1075
1076 EXPECT_EQ(64, constraints.layoutSize.width()); 1076 EXPECT_EQ(64, constraints.layoutSize.width());
1077 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1077 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1078 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1078 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1079 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1079 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1080 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1080 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1081 EXPECT_TRUE(page->viewportDescription().userZoom); 1081 EXPECT_TRUE(page->viewportDescription().userZoom);
1082 } 1082 }
1083 1083
1084 TEST_F(ViewportTest, viewport55) 1084 TEST_F(ViewportTest, viewport55)
1085 { 1085 {
1086 registerMockedHttpURLLoad("viewport/viewport-55.html"); 1086 registerMockedHttpURLLoad("viewport/viewport-55.html");
1087 1087
1088 FrameTestHelpers::WebViewHelper webViewHelper; 1088 FrameTestHelpers::WebViewHelper webViewHelper;
1089 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-55.html", tru e, 0, 0, setViewportSettings); 1089 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-55.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1090 1090
1091 Page* page = webViewHelper.webViewImpl()->page(); 1091 Page* page = webViewHelper.webViewImpl()->page();
1092 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1092 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1093 1093
1094 EXPECT_EQ(64, constraints.layoutSize.width()); 1094 EXPECT_EQ(64, constraints.layoutSize.width());
1095 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1095 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1096 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1096 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1097 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1097 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1098 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1098 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1099 EXPECT_TRUE(page->viewportDescription().userZoom); 1099 EXPECT_TRUE(page->viewportDescription().userZoom);
1100 } 1100 }
1101 1101
1102 TEST_F(ViewportTest, viewport56) 1102 TEST_F(ViewportTest, viewport56)
1103 { 1103 {
1104 registerMockedHttpURLLoad("viewport/viewport-56.html"); 1104 registerMockedHttpURLLoad("viewport/viewport-56.html");
1105 1105
1106 FrameTestHelpers::WebViewHelper webViewHelper; 1106 FrameTestHelpers::WebViewHelper webViewHelper;
1107 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-56.html", tru e, 0, 0, setViewportSettings); 1107 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-56.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1108 1108
1109 Page* page = webViewHelper.webViewImpl()->page(); 1109 Page* page = webViewHelper.webViewImpl()->page();
1110 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1110 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1111 1111
1112 EXPECT_EQ(980, constraints.layoutSize.width()); 1112 EXPECT_EQ(980, constraints.layoutSize.width());
1113 EXPECT_EQ(1078, constraints.layoutSize.height()); 1113 EXPECT_EQ(1078, constraints.layoutSize.height());
1114 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1114 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1115 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1115 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1116 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1116 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1117 EXPECT_TRUE(page->viewportDescription().userZoom); 1117 EXPECT_TRUE(page->viewportDescription().userZoom);
1118 } 1118 }
1119 1119
1120 TEST_F(ViewportTest, viewport57) 1120 TEST_F(ViewportTest, viewport57)
1121 { 1121 {
1122 registerMockedHttpURLLoad("viewport/viewport-57.html"); 1122 registerMockedHttpURLLoad("viewport/viewport-57.html");
1123 1123
1124 FrameTestHelpers::WebViewHelper webViewHelper; 1124 FrameTestHelpers::WebViewHelper webViewHelper;
1125 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-57.html", tru e, 0, 0, setViewportSettings); 1125 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-57.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1126 1126
1127 Page* page = webViewHelper.webViewImpl()->page(); 1127 Page* page = webViewHelper.webViewImpl()->page();
1128 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1128 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1129 1129
1130 EXPECT_EQ(320, constraints.layoutSize.width()); 1130 EXPECT_EQ(320, constraints.layoutSize.width());
1131 EXPECT_EQ(352, constraints.layoutSize.height()); 1131 EXPECT_EQ(352, constraints.layoutSize.height());
1132 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1132 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1133 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1133 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1134 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1134 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1135 EXPECT_TRUE(page->viewportDescription().userZoom); 1135 EXPECT_TRUE(page->viewportDescription().userZoom);
1136 } 1136 }
1137 1137
1138 TEST_F(ViewportTest, viewport58) 1138 TEST_F(ViewportTest, viewport58)
1139 { 1139 {
1140 registerMockedHttpURLLoad("viewport/viewport-58.html"); 1140 registerMockedHttpURLLoad("viewport/viewport-58.html");
1141 1141
1142 FrameTestHelpers::WebViewHelper webViewHelper; 1142 FrameTestHelpers::WebViewHelper webViewHelper;
1143 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-58.html", tru e, 0, 0, setViewportSettings); 1143 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-58.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1144 1144
1145 Page* page = webViewHelper.webViewImpl()->page(); 1145 Page* page = webViewHelper.webViewImpl()->page();
1146 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1146 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1147 1147
1148 EXPECT_EQ(3200, constraints.layoutSize.width()); 1148 EXPECT_EQ(3200, constraints.layoutSize.width());
1149 EXPECT_EQ(3520, constraints.layoutSize.height()); 1149 EXPECT_EQ(3520, constraints.layoutSize.height());
1150 EXPECT_NEAR(0.1f, constraints.initialScale, 0.01f); 1150 EXPECT_NEAR(0.1f, constraints.initialScale, 0.01f);
1151 EXPECT_NEAR(0.1f, constraints.minimumScale, 0.01f); 1151 EXPECT_NEAR(0.1f, constraints.minimumScale, 0.01f);
1152 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1152 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1153 EXPECT_TRUE(page->viewportDescription().userZoom); 1153 EXPECT_TRUE(page->viewportDescription().userZoom);
1154 } 1154 }
1155 1155
1156 TEST_F(ViewportTest, viewport59) 1156 TEST_F(ViewportTest, viewport59)
1157 { 1157 {
1158 registerMockedHttpURLLoad("viewport/viewport-59.html"); 1158 registerMockedHttpURLLoad("viewport/viewport-59.html");
1159 1159
1160 FrameTestHelpers::WebViewHelper webViewHelper; 1160 FrameTestHelpers::WebViewHelper webViewHelper;
1161 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-59.html", tru e, 0, 0, setViewportSettings); 1161 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-59.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1162 1162
1163 Page* page = webViewHelper.webViewImpl()->page(); 1163 Page* page = webViewHelper.webViewImpl()->page();
1164 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1164 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1165 1165
1166 EXPECT_EQ(320, constraints.layoutSize.width()); 1166 EXPECT_EQ(320, constraints.layoutSize.width());
1167 EXPECT_EQ(352, constraints.layoutSize.height()); 1167 EXPECT_EQ(352, constraints.layoutSize.height());
1168 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1168 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1169 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1169 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1170 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f); 1170 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f);
1171 EXPECT_TRUE(page->viewportDescription().userZoom); 1171 EXPECT_TRUE(page->viewportDescription().userZoom);
1172 } 1172 }
1173 1173
1174 TEST_F(ViewportTest, viewport60) 1174 TEST_F(ViewportTest, viewport60)
1175 { 1175 {
1176 registerMockedHttpURLLoad("viewport/viewport-60.html"); 1176 registerMockedHttpURLLoad("viewport/viewport-60.html");
1177 1177
1178 FrameTestHelpers::WebViewHelper webViewHelper; 1178 FrameTestHelpers::WebViewHelper webViewHelper;
1179 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-60.html", tru e, 0, 0, setViewportSettings); 1179 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-60.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1180 1180
1181 Page* page = webViewHelper.webViewImpl()->page(); 1181 Page* page = webViewHelper.webViewImpl()->page();
1182 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1182 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1183 1183
1184 EXPECT_EQ(32, constraints.layoutSize.width()); 1184 EXPECT_EQ(32, constraints.layoutSize.width());
1185 EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01f); 1185 EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01f);
1186 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 1186 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
1187 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 1187 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
1188 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 1188 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
1189 EXPECT_TRUE(page->viewportDescription().userZoom); 1189 EXPECT_TRUE(page->viewportDescription().userZoom);
1190 } 1190 }
1191 1191
1192 TEST_F(ViewportTest, viewport61) 1192 TEST_F(ViewportTest, viewport61)
1193 { 1193 {
1194 registerMockedHttpURLLoad("viewport/viewport-61.html"); 1194 registerMockedHttpURLLoad("viewport/viewport-61.html");
1195 1195
1196 FrameTestHelpers::WebViewHelper webViewHelper; 1196 FrameTestHelpers::WebViewHelper webViewHelper;
1197 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-61.html", tru e, 0, 0, setViewportSettings); 1197 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-61.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1198 1198
1199 Page* page = webViewHelper.webViewImpl()->page(); 1199 Page* page = webViewHelper.webViewImpl()->page();
1200 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1200 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1201 1201
1202 EXPECT_EQ(320, constraints.layoutSize.width()); 1202 EXPECT_EQ(320, constraints.layoutSize.width());
1203 EXPECT_EQ(352, constraints.layoutSize.height()); 1203 EXPECT_EQ(352, constraints.layoutSize.height());
1204 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1204 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1205 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1205 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1206 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1206 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1207 EXPECT_TRUE(page->viewportDescription().userZoom); 1207 EXPECT_TRUE(page->viewportDescription().userZoom);
1208 } 1208 }
1209 1209
1210 TEST_F(ViewportTest, viewport62) 1210 TEST_F(ViewportTest, viewport62)
1211 { 1211 {
1212 registerMockedHttpURLLoad("viewport/viewport-62.html"); 1212 registerMockedHttpURLLoad("viewport/viewport-62.html");
1213 1213
1214 FrameTestHelpers::WebViewHelper webViewHelper; 1214 FrameTestHelpers::WebViewHelper webViewHelper;
1215 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-62.html", tru e, 0, 0, setViewportSettings); 1215 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-62.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1216 1216
1217 Page* page = webViewHelper.webViewImpl()->page(); 1217 Page* page = webViewHelper.webViewImpl()->page();
1218 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1218 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1219 1219
1220 EXPECT_EQ(320, constraints.layoutSize.width()); 1220 EXPECT_EQ(320, constraints.layoutSize.width());
1221 EXPECT_EQ(352, constraints.layoutSize.height()); 1221 EXPECT_EQ(352, constraints.layoutSize.height());
1222 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1222 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1223 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1223 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1224 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1224 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1225 EXPECT_TRUE(page->viewportDescription().userZoom); 1225 EXPECT_TRUE(page->viewportDescription().userZoom);
1226 } 1226 }
1227 1227
1228 TEST_F(ViewportTest, viewport63) 1228 TEST_F(ViewportTest, viewport63)
1229 { 1229 {
1230 registerMockedHttpURLLoad("viewport/viewport-63.html"); 1230 registerMockedHttpURLLoad("viewport/viewport-63.html");
1231 1231
1232 FrameTestHelpers::WebViewHelper webViewHelper; 1232 FrameTestHelpers::WebViewHelper webViewHelper;
1233 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-63.html", tru e, 0, 0, setViewportSettings); 1233 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-63.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1234 1234
1235 Page* page = webViewHelper.webViewImpl()->page(); 1235 Page* page = webViewHelper.webViewImpl()->page();
1236 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1236 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1237 1237
1238 EXPECT_EQ(320, constraints.layoutSize.width()); 1238 EXPECT_EQ(320, constraints.layoutSize.width());
1239 EXPECT_EQ(352, constraints.layoutSize.height()); 1239 EXPECT_EQ(352, constraints.layoutSize.height());
1240 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1240 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1241 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1241 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1242 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1242 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1243 EXPECT_TRUE(page->viewportDescription().userZoom); 1243 EXPECT_TRUE(page->viewportDescription().userZoom);
1244 } 1244 }
1245 1245
1246 TEST_F(ViewportTest, viewport64) 1246 TEST_F(ViewportTest, viewport64)
1247 { 1247 {
1248 registerMockedHttpURLLoad("viewport/viewport-64.html"); 1248 registerMockedHttpURLLoad("viewport/viewport-64.html");
1249 1249
1250 FrameTestHelpers::WebViewHelper webViewHelper; 1250 FrameTestHelpers::WebViewHelper webViewHelper;
1251 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-64.html", tru e, 0, 0, setViewportSettings); 1251 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-64.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1252 1252
1253 Page* page = webViewHelper.webViewImpl()->page(); 1253 Page* page = webViewHelper.webViewImpl()->page();
1254 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1254 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1255 1255
1256 EXPECT_EQ(320, constraints.layoutSize.width()); 1256 EXPECT_EQ(320, constraints.layoutSize.width());
1257 EXPECT_EQ(352, constraints.layoutSize.height()); 1257 EXPECT_EQ(352, constraints.layoutSize.height());
1258 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1258 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1259 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1259 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1260 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1260 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1261 EXPECT_TRUE(page->viewportDescription().userZoom); 1261 EXPECT_TRUE(page->viewportDescription().userZoom);
1262 } 1262 }
1263 1263
1264 TEST_F(ViewportTest, viewport65) 1264 TEST_F(ViewportTest, viewport65)
1265 { 1265 {
1266 registerMockedHttpURLLoad("viewport/viewport-65.html"); 1266 registerMockedHttpURLLoad("viewport/viewport-65.html");
1267 1267
1268 FrameTestHelpers::WebViewHelper webViewHelper; 1268 FrameTestHelpers::WebViewHelper webViewHelper;
1269 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-65.html", tru e, 0, 0, setViewportSettings); 1269 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-65.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1270 1270
1271 Page* page = webViewHelper.webViewImpl()->page(); 1271 Page* page = webViewHelper.webViewImpl()->page();
1272 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1272 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1273 1273
1274 EXPECT_EQ(100, constraints.layoutSize.width()); 1274 EXPECT_EQ(100, constraints.layoutSize.width());
1275 EXPECT_EQ(110, constraints.layoutSize.height()); 1275 EXPECT_EQ(110, constraints.layoutSize.height());
1276 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1276 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1277 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1277 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1278 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1278 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1279 EXPECT_TRUE(page->viewportDescription().userZoom); 1279 EXPECT_TRUE(page->viewportDescription().userZoom);
1280 } 1280 }
1281 1281
1282 TEST_F(ViewportTest, viewport66) 1282 TEST_F(ViewportTest, viewport66)
1283 { 1283 {
1284 registerMockedHttpURLLoad("viewport/viewport-66.html"); 1284 registerMockedHttpURLLoad("viewport/viewport-66.html");
1285 1285
1286 FrameTestHelpers::WebViewHelper webViewHelper; 1286 FrameTestHelpers::WebViewHelper webViewHelper;
1287 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-66.html", tru e, 0, 0, setViewportSettings); 1287 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-66.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1288 1288
1289 Page* page = webViewHelper.webViewImpl()->page(); 1289 Page* page = webViewHelper.webViewImpl()->page();
1290 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1290 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1291 1291
1292 EXPECT_EQ(100, constraints.layoutSize.width()); 1292 EXPECT_EQ(100, constraints.layoutSize.width());
1293 EXPECT_EQ(110, constraints.layoutSize.height()); 1293 EXPECT_EQ(110, constraints.layoutSize.height());
1294 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1294 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1295 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1295 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1296 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1296 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1297 EXPECT_TRUE(page->viewportDescription().userZoom); 1297 EXPECT_TRUE(page->viewportDescription().userZoom);
1298 } 1298 }
1299 1299
1300 TEST_F(ViewportTest, viewport67) 1300 TEST_F(ViewportTest, viewport67)
1301 { 1301 {
1302 registerMockedHttpURLLoad("viewport/viewport-67.html"); 1302 registerMockedHttpURLLoad("viewport/viewport-67.html");
1303 1303
1304 FrameTestHelpers::WebViewHelper webViewHelper; 1304 FrameTestHelpers::WebViewHelper webViewHelper;
1305 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-67.html", tru e, 0, 0, setViewportSettings); 1305 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-67.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1306 1306
1307 Page* page = webViewHelper.webViewImpl()->page(); 1307 Page* page = webViewHelper.webViewImpl()->page();
1308 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1308 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1309 1309
1310 EXPECT_EQ(320, constraints.layoutSize.width()); 1310 EXPECT_EQ(320, constraints.layoutSize.width());
1311 EXPECT_EQ(352, constraints.layoutSize.height()); 1311 EXPECT_EQ(352, constraints.layoutSize.height());
1312 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1312 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1313 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1313 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1314 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1314 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1315 EXPECT_TRUE(page->viewportDescription().userZoom); 1315 EXPECT_TRUE(page->viewportDescription().userZoom);
1316 } 1316 }
1317 1317
1318 TEST_F(ViewportTest, viewport68) 1318 TEST_F(ViewportTest, viewport68)
1319 { 1319 {
1320 registerMockedHttpURLLoad("viewport/viewport-68.html"); 1320 registerMockedHttpURLLoad("viewport/viewport-68.html");
1321 1321
1322 FrameTestHelpers::WebViewHelper webViewHelper; 1322 FrameTestHelpers::WebViewHelper webViewHelper;
1323 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-68.html", tru e, 0, 0, setViewportSettings); 1323 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-68.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1324 1324
1325 Page* page = webViewHelper.webViewImpl()->page(); 1325 Page* page = webViewHelper.webViewImpl()->page();
1326 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1326 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1327 1327
1328 EXPECT_EQ(320, constraints.layoutSize.width()); 1328 EXPECT_EQ(320, constraints.layoutSize.width());
1329 EXPECT_EQ(352, constraints.layoutSize.height()); 1329 EXPECT_EQ(352, constraints.layoutSize.height());
1330 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1330 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1331 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1331 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1332 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1332 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1333 EXPECT_TRUE(page->viewportDescription().userZoom); 1333 EXPECT_TRUE(page->viewportDescription().userZoom);
1334 } 1334 }
1335 1335
1336 TEST_F(ViewportTest, viewport69) 1336 TEST_F(ViewportTest, viewport69)
1337 { 1337 {
1338 registerMockedHttpURLLoad("viewport/viewport-69.html"); 1338 registerMockedHttpURLLoad("viewport/viewport-69.html");
1339 1339
1340 FrameTestHelpers::WebViewHelper webViewHelper; 1340 FrameTestHelpers::WebViewHelper webViewHelper;
1341 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-69.html", tru e, 0, 0, setViewportSettings); 1341 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-69.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1342 1342
1343 Page* page = webViewHelper.webViewImpl()->page(); 1343 Page* page = webViewHelper.webViewImpl()->page();
1344 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1344 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1345 1345
1346 EXPECT_EQ(100, constraints.layoutSize.width()); 1346 EXPECT_EQ(100, constraints.layoutSize.width());
1347 EXPECT_EQ(110, constraints.layoutSize.height()); 1347 EXPECT_EQ(110, constraints.layoutSize.height());
1348 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1348 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1349 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1349 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1350 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1350 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1351 EXPECT_TRUE(page->viewportDescription().userZoom); 1351 EXPECT_TRUE(page->viewportDescription().userZoom);
1352 } 1352 }
1353 1353
1354 TEST_F(ViewportTest, viewport70) 1354 TEST_F(ViewportTest, viewport70)
1355 { 1355 {
1356 registerMockedHttpURLLoad("viewport/viewport-70.html"); 1356 registerMockedHttpURLLoad("viewport/viewport-70.html");
1357 1357
1358 FrameTestHelpers::WebViewHelper webViewHelper; 1358 FrameTestHelpers::WebViewHelper webViewHelper;
1359 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-70.html", tru e, 0, 0, setViewportSettings); 1359 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-70.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1360 1360
1361 Page* page = webViewHelper.webViewImpl()->page(); 1361 Page* page = webViewHelper.webViewImpl()->page();
1362 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1362 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1363 1363
1364 EXPECT_EQ(100, constraints.layoutSize.width()); 1364 EXPECT_EQ(100, constraints.layoutSize.width());
1365 EXPECT_EQ(110, constraints.layoutSize.height()); 1365 EXPECT_EQ(110, constraints.layoutSize.height());
1366 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1366 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1367 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1367 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1368 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1368 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1369 EXPECT_TRUE(page->viewportDescription().userZoom); 1369 EXPECT_TRUE(page->viewportDescription().userZoom);
1370 } 1370 }
1371 1371
1372 TEST_F(ViewportTest, viewport71) 1372 TEST_F(ViewportTest, viewport71)
1373 { 1373 {
1374 registerMockedHttpURLLoad("viewport/viewport-71.html"); 1374 registerMockedHttpURLLoad("viewport/viewport-71.html");
1375 1375
1376 FrameTestHelpers::WebViewHelper webViewHelper; 1376 FrameTestHelpers::WebViewHelper webViewHelper;
1377 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-71.html", tru e, 0, 0, setViewportSettings); 1377 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-71.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1378 1378
1379 Page* page = webViewHelper.webViewImpl()->page(); 1379 Page* page = webViewHelper.webViewImpl()->page();
1380 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1380 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1381 1381
1382 EXPECT_EQ(320, constraints.layoutSize.width()); 1382 EXPECT_EQ(320, constraints.layoutSize.width());
1383 EXPECT_EQ(352, constraints.layoutSize.height()); 1383 EXPECT_EQ(352, constraints.layoutSize.height());
1384 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1384 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1385 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1385 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1386 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1386 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1387 EXPECT_TRUE(page->viewportDescription().userZoom); 1387 EXPECT_TRUE(page->viewportDescription().userZoom);
1388 } 1388 }
1389 1389
1390 TEST_F(ViewportTest, viewport72) 1390 TEST_F(ViewportTest, viewport72)
1391 { 1391 {
1392 registerMockedHttpURLLoad("viewport/viewport-72.html"); 1392 registerMockedHttpURLLoad("viewport/viewport-72.html");
1393 1393
1394 FrameTestHelpers::WebViewHelper webViewHelper; 1394 FrameTestHelpers::WebViewHelper webViewHelper;
1395 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-72.html", tru e, 0, 0, setViewportSettings); 1395 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-72.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1396 1396
1397 Page* page = webViewHelper.webViewImpl()->page(); 1397 Page* page = webViewHelper.webViewImpl()->page();
1398 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1398 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1399 1399
1400 EXPECT_EQ(100, constraints.layoutSize.width()); 1400 EXPECT_EQ(100, constraints.layoutSize.width());
1401 EXPECT_EQ(110, constraints.layoutSize.height()); 1401 EXPECT_EQ(110, constraints.layoutSize.height());
1402 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1402 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1403 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1403 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1404 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1404 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1405 EXPECT_TRUE(page->viewportDescription().userZoom); 1405 EXPECT_TRUE(page->viewportDescription().userZoom);
1406 } 1406 }
1407 1407
1408 TEST_F(ViewportTest, viewport73) 1408 TEST_F(ViewportTest, viewport73)
1409 { 1409 {
1410 registerMockedHttpURLLoad("viewport/viewport-73.html"); 1410 registerMockedHttpURLLoad("viewport/viewport-73.html");
1411 1411
1412 FrameTestHelpers::WebViewHelper webViewHelper; 1412 FrameTestHelpers::WebViewHelper webViewHelper;
1413 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-73.html", tru e, 0, 0, setViewportSettings); 1413 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-73.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1414 1414
1415 Page* page = webViewHelper.webViewImpl()->page(); 1415 Page* page = webViewHelper.webViewImpl()->page();
1416 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1416 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1417 1417
1418 EXPECT_EQ(100, constraints.layoutSize.width()); 1418 EXPECT_EQ(100, constraints.layoutSize.width());
1419 EXPECT_EQ(110, constraints.layoutSize.height()); 1419 EXPECT_EQ(110, constraints.layoutSize.height());
1420 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1420 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1421 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1421 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1422 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1422 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1423 EXPECT_TRUE(page->viewportDescription().userZoom); 1423 EXPECT_TRUE(page->viewportDescription().userZoom);
1424 } 1424 }
1425 1425
1426 TEST_F(ViewportTest, viewport74) 1426 TEST_F(ViewportTest, viewport74)
1427 { 1427 {
1428 registerMockedHttpURLLoad("viewport/viewport-74.html"); 1428 registerMockedHttpURLLoad("viewport/viewport-74.html");
1429 1429
1430 FrameTestHelpers::WebViewHelper webViewHelper; 1430 FrameTestHelpers::WebViewHelper webViewHelper;
1431 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-74.html", tru e, 0, 0, setViewportSettings); 1431 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-74.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1432 1432
1433 Page* page = webViewHelper.webViewImpl()->page(); 1433 Page* page = webViewHelper.webViewImpl()->page();
1434 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1434 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1435 1435
1436 EXPECT_EQ(100, constraints.layoutSize.width()); 1436 EXPECT_EQ(100, constraints.layoutSize.width());
1437 EXPECT_EQ(110, constraints.layoutSize.height()); 1437 EXPECT_EQ(110, constraints.layoutSize.height());
1438 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1438 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1439 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1439 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1440 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1440 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1441 EXPECT_TRUE(page->viewportDescription().userZoom); 1441 EXPECT_TRUE(page->viewportDescription().userZoom);
1442 } 1442 }
1443 1443
1444 TEST_F(ViewportTest, viewport75) 1444 TEST_F(ViewportTest, viewport75)
1445 { 1445 {
1446 registerMockedHttpURLLoad("viewport/viewport-75.html"); 1446 registerMockedHttpURLLoad("viewport/viewport-75.html");
1447 1447
1448 FrameTestHelpers::WebViewHelper webViewHelper; 1448 FrameTestHelpers::WebViewHelper webViewHelper;
1449 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-75.html", tru e, 0, 0, setViewportSettings); 1449 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-75.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1450 1450
1451 Page* page = webViewHelper.webViewImpl()->page(); 1451 Page* page = webViewHelper.webViewImpl()->page();
1452 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1452 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1453 1453
1454 EXPECT_EQ(64, constraints.layoutSize.width()); 1454 EXPECT_EQ(64, constraints.layoutSize.width());
1455 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1455 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1456 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1456 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1457 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1457 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1458 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1458 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1459 EXPECT_TRUE(page->viewportDescription().userZoom); 1459 EXPECT_TRUE(page->viewportDescription().userZoom);
1460 } 1460 }
1461 1461
1462 TEST_F(ViewportTest, viewport76) 1462 TEST_F(ViewportTest, viewport76)
1463 { 1463 {
1464 registerMockedHttpURLLoad("viewport/viewport-76.html"); 1464 registerMockedHttpURLLoad("viewport/viewport-76.html");
1465 1465
1466 FrameTestHelpers::WebViewHelper webViewHelper; 1466 FrameTestHelpers::WebViewHelper webViewHelper;
1467 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-76.html", tru e, 0, 0, setViewportSettings); 1467 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-76.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1468 1468
1469 Page* page = webViewHelper.webViewImpl()->page(); 1469 Page* page = webViewHelper.webViewImpl()->page();
1470 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1470 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1471 1471
1472 EXPECT_EQ(32, constraints.layoutSize.width()); 1472 EXPECT_EQ(32, constraints.layoutSize.width());
1473 EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01); 1473 EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01);
1474 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 1474 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
1475 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 1475 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
1476 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 1476 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
1477 EXPECT_TRUE(page->viewportDescription().userZoom); 1477 EXPECT_TRUE(page->viewportDescription().userZoom);
1478 } 1478 }
1479 1479
1480 TEST_F(ViewportTest, viewport77) 1480 TEST_F(ViewportTest, viewport77)
1481 { 1481 {
1482 registerMockedHttpURLLoad("viewport/viewport-77.html"); 1482 registerMockedHttpURLLoad("viewport/viewport-77.html");
1483 1483
1484 FrameTestHelpers::WebViewHelper webViewHelper; 1484 FrameTestHelpers::WebViewHelper webViewHelper;
1485 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-77.html", tru e, 0, 0, setViewportSettings); 1485 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-77.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1486 1486
1487 Page* page = webViewHelper.webViewImpl()->page(); 1487 Page* page = webViewHelper.webViewImpl()->page();
1488 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1488 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1489 1489
1490 EXPECT_EQ(1280, constraints.layoutSize.width()); 1490 EXPECT_EQ(1280, constraints.layoutSize.width());
1491 EXPECT_EQ(1408, constraints.layoutSize.height()); 1491 EXPECT_EQ(1408, constraints.layoutSize.height());
1492 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 1492 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
1493 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 1493 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
1494 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1494 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1495 EXPECT_TRUE(page->viewportDescription().userZoom); 1495 EXPECT_TRUE(page->viewportDescription().userZoom);
1496 } 1496 }
1497 1497
1498 TEST_F(ViewportTest, viewport78) 1498 TEST_F(ViewportTest, viewport78)
1499 { 1499 {
1500 registerMockedHttpURLLoad("viewport/viewport-78.html"); 1500 registerMockedHttpURLLoad("viewport/viewport-78.html");
1501 1501
1502 FrameTestHelpers::WebViewHelper webViewHelper; 1502 FrameTestHelpers::WebViewHelper webViewHelper;
1503 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-78.html", tru e, 0, 0, setViewportSettings); 1503 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-78.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1504 1504
1505 Page* page = webViewHelper.webViewImpl()->page(); 1505 Page* page = webViewHelper.webViewImpl()->page();
1506 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1506 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1507 1507
1508 EXPECT_EQ(100, constraints.layoutSize.width()); 1508 EXPECT_EQ(100, constraints.layoutSize.width());
1509 EXPECT_EQ(110, constraints.layoutSize.height()); 1509 EXPECT_EQ(110, constraints.layoutSize.height());
1510 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f); 1510 EXPECT_NEAR(3.2f, constraints.initialScale, 0.01f);
1511 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f); 1511 EXPECT_NEAR(3.2f, constraints.minimumScale, 0.01f);
1512 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1512 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1513 EXPECT_TRUE(page->viewportDescription().userZoom); 1513 EXPECT_TRUE(page->viewportDescription().userZoom);
1514 } 1514 }
1515 1515
1516 TEST_F(ViewportTest, viewport79) 1516 TEST_F(ViewportTest, viewport79)
1517 { 1517 {
1518 registerMockedHttpURLLoad("viewport/viewport-79.html"); 1518 registerMockedHttpURLLoad("viewport/viewport-79.html");
1519 1519
1520 FrameTestHelpers::WebViewHelper webViewHelper; 1520 FrameTestHelpers::WebViewHelper webViewHelper;
1521 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-79.html", tru e, 0, 0, setViewportSettings); 1521 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-79.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1522 1522
1523 Page* page = webViewHelper.webViewImpl()->page(); 1523 Page* page = webViewHelper.webViewImpl()->page();
1524 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1524 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1525 1525
1526 EXPECT_EQ(320, constraints.layoutSize.width()); 1526 EXPECT_EQ(320, constraints.layoutSize.width());
1527 EXPECT_EQ(352, constraints.layoutSize.height()); 1527 EXPECT_EQ(352, constraints.layoutSize.height());
1528 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1528 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1529 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1529 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1530 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1530 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1531 EXPECT_TRUE(page->viewportDescription().userZoom); 1531 EXPECT_TRUE(page->viewportDescription().userZoom);
1532 } 1532 }
1533 1533
1534 TEST_F(ViewportTest, viewport80) 1534 TEST_F(ViewportTest, viewport80)
1535 { 1535 {
1536 registerMockedHttpURLLoad("viewport/viewport-80.html"); 1536 registerMockedHttpURLLoad("viewport/viewport-80.html");
1537 1537
1538 FrameTestHelpers::WebViewHelper webViewHelper; 1538 FrameTestHelpers::WebViewHelper webViewHelper;
1539 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-80.html", tru e, 0, 0, setViewportSettings); 1539 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-80.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1540 1540
1541 Page* page = webViewHelper.webViewImpl()->page(); 1541 Page* page = webViewHelper.webViewImpl()->page();
1542 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1542 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1543 1543
1544 EXPECT_EQ(320, constraints.layoutSize.width()); 1544 EXPECT_EQ(320, constraints.layoutSize.width());
1545 EXPECT_EQ(352, constraints.layoutSize.height()); 1545 EXPECT_EQ(352, constraints.layoutSize.height());
1546 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 1546 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
1547 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 1547 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
1548 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1548 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1549 EXPECT_TRUE(page->viewportDescription().userZoom); 1549 EXPECT_TRUE(page->viewportDescription().userZoom);
1550 } 1550 }
1551 1551
1552 TEST_F(ViewportTest, viewport81) 1552 TEST_F(ViewportTest, viewport81)
1553 { 1553 {
1554 registerMockedHttpURLLoad("viewport/viewport-81.html"); 1554 registerMockedHttpURLLoad("viewport/viewport-81.html");
1555 1555
1556 FrameTestHelpers::WebViewHelper webViewHelper; 1556 FrameTestHelpers::WebViewHelper webViewHelper;
1557 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-81.html", tru e, 0, 0, setViewportSettings); 1557 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-81.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1558 1558
1559 Page* page = webViewHelper.webViewImpl()->page(); 1559 Page* page = webViewHelper.webViewImpl()->page();
1560 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1560 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1561 1561
1562 EXPECT_EQ(3000, constraints.layoutSize.width()); 1562 EXPECT_EQ(3000, constraints.layoutSize.width());
1563 EXPECT_EQ(3300, constraints.layoutSize.height()); 1563 EXPECT_EQ(3300, constraints.layoutSize.height());
1564 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f); 1564 EXPECT_NEAR(0.25f, constraints.initialScale, 0.01f);
1565 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f); 1565 EXPECT_NEAR(0.25f, constraints.minimumScale, 0.01f);
1566 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1566 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1567 EXPECT_TRUE(page->viewportDescription().userZoom); 1567 EXPECT_TRUE(page->viewportDescription().userZoom);
1568 } 1568 }
1569 1569
1570 TEST_F(ViewportTest, viewport82) 1570 TEST_F(ViewportTest, viewport82)
1571 { 1571 {
1572 registerMockedHttpURLLoad("viewport/viewport-82.html"); 1572 registerMockedHttpURLLoad("viewport/viewport-82.html");
1573 1573
1574 FrameTestHelpers::WebViewHelper webViewHelper; 1574 FrameTestHelpers::WebViewHelper webViewHelper;
1575 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-82.html", tru e, 0, 0, setViewportSettings); 1575 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-82.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1576 1576
1577 Page* page = webViewHelper.webViewImpl()->page(); 1577 Page* page = webViewHelper.webViewImpl()->page();
1578 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1578 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1579 1579
1580 EXPECT_EQ(400, constraints.layoutSize.width()); 1580 EXPECT_EQ(400, constraints.layoutSize.width());
1581 EXPECT_EQ(440, constraints.layoutSize.height()); 1581 EXPECT_EQ(440, constraints.layoutSize.height());
1582 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1582 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1583 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1583 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1584 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1584 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1585 EXPECT_TRUE(page->viewportDescription().userZoom); 1585 EXPECT_TRUE(page->viewportDescription().userZoom);
1586 } 1586 }
1587 1587
1588 TEST_F(ViewportTest, viewport83) 1588 TEST_F(ViewportTest, viewport83)
1589 { 1589 {
1590 registerMockedHttpURLLoad("viewport/viewport-83.html"); 1590 registerMockedHttpURLLoad("viewport/viewport-83.html");
1591 1591
1592 FrameTestHelpers::WebViewHelper webViewHelper; 1592 FrameTestHelpers::WebViewHelper webViewHelper;
1593 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-83.html", tru e, 0, 0, setViewportSettings); 1593 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-83.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1594 1594
1595 Page* page = webViewHelper.webViewImpl()->page(); 1595 Page* page = webViewHelper.webViewImpl()->page();
1596 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1596 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1597 1597
1598 EXPECT_EQ(64, constraints.layoutSize.width()); 1598 EXPECT_EQ(64, constraints.layoutSize.width());
1599 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1599 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1600 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1600 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1601 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1601 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1602 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1602 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1603 EXPECT_TRUE(page->viewportDescription().userZoom); 1603 EXPECT_TRUE(page->viewportDescription().userZoom);
1604 } 1604 }
1605 1605
1606 TEST_F(ViewportTest, viewport84) 1606 TEST_F(ViewportTest, viewport84)
1607 { 1607 {
1608 registerMockedHttpURLLoad("viewport/viewport-84.html"); 1608 registerMockedHttpURLLoad("viewport/viewport-84.html");
1609 1609
1610 FrameTestHelpers::WebViewHelper webViewHelper; 1610 FrameTestHelpers::WebViewHelper webViewHelper;
1611 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-84.html", tru e, 0, 0, setViewportSettings); 1611 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-84.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1612 1612
1613 Page* page = webViewHelper.webViewImpl()->page(); 1613 Page* page = webViewHelper.webViewImpl()->page();
1614 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1614 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1615 1615
1616 EXPECT_EQ(64, constraints.layoutSize.width()); 1616 EXPECT_EQ(64, constraints.layoutSize.width());
1617 EXPECT_EQ(480, constraints.layoutSize.height()); 1617 EXPECT_EQ(480, constraints.layoutSize.height());
1618 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1618 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1619 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1619 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1620 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1620 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1621 EXPECT_TRUE(page->viewportDescription().userZoom); 1621 EXPECT_TRUE(page->viewportDescription().userZoom);
1622 } 1622 }
1623 1623
1624 TEST_F(ViewportTest, viewport85) 1624 TEST_F(ViewportTest, viewport85)
1625 { 1625 {
1626 registerMockedHttpURLLoad("viewport/viewport-85.html"); 1626 registerMockedHttpURLLoad("viewport/viewport-85.html");
1627 1627
1628 FrameTestHelpers::WebViewHelper webViewHelper; 1628 FrameTestHelpers::WebViewHelper webViewHelper;
1629 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-85.html", tru e, 0, 0, setViewportSettings); 1629 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-85.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1630 1630
1631 Page* page = webViewHelper.webViewImpl()->page(); 1631 Page* page = webViewHelper.webViewImpl()->page();
1632 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1632 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1633 1633
1634 EXPECT_EQ(540, constraints.layoutSize.width()); 1634 EXPECT_EQ(540, constraints.layoutSize.width());
1635 EXPECT_EQ(594, constraints.layoutSize.height()); 1635 EXPECT_EQ(594, constraints.layoutSize.height());
1636 EXPECT_NEAR(0.59f, constraints.initialScale, 0.01f); 1636 EXPECT_NEAR(0.59f, constraints.initialScale, 0.01f);
1637 EXPECT_NEAR(0.59f, constraints.minimumScale, 0.01f); 1637 EXPECT_NEAR(0.59f, constraints.minimumScale, 0.01f);
1638 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1638 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1639 EXPECT_TRUE(page->viewportDescription().userZoom); 1639 EXPECT_TRUE(page->viewportDescription().userZoom);
1640 } 1640 }
1641 1641
1642 TEST_F(ViewportTest, viewport86) 1642 TEST_F(ViewportTest, viewport86)
1643 { 1643 {
1644 registerMockedHttpURLLoad("viewport/viewport-86.html"); 1644 registerMockedHttpURLLoad("viewport/viewport-86.html");
1645 1645
1646 FrameTestHelpers::WebViewHelper webViewHelper; 1646 FrameTestHelpers::WebViewHelper webViewHelper;
1647 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-86.html", tru e, 0, 0, setViewportSettings); 1647 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-86.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1648 1648
1649 Page* page = webViewHelper.webViewImpl()->page(); 1649 Page* page = webViewHelper.webViewImpl()->page();
1650 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1650 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1651 1651
1652 EXPECT_NEAR(457.14, constraints.layoutSize.width(), 0.01f); 1652 EXPECT_NEAR(457.14, constraints.layoutSize.width(), 0.01f);
1653 EXPECT_NEAR(502.86, constraints.layoutSize.height(), 0.01f); 1653 EXPECT_NEAR(502.86, constraints.layoutSize.height(), 0.01f);
1654 EXPECT_NEAR(0.7f, constraints.initialScale, 0.01f); 1654 EXPECT_NEAR(0.7f, constraints.initialScale, 0.01f);
1655 EXPECT_NEAR(0.7f, constraints.minimumScale, 0.01f); 1655 EXPECT_NEAR(0.7f, constraints.minimumScale, 0.01f);
1656 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1656 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1657 EXPECT_TRUE(page->viewportDescription().userZoom); 1657 EXPECT_TRUE(page->viewportDescription().userZoom);
1658 } 1658 }
1659 1659
1660 TEST_F(ViewportTest, viewport87) 1660 TEST_F(ViewportTest, viewport87)
1661 { 1661 {
1662 registerMockedHttpURLLoad("viewport/viewport-87.html"); 1662 registerMockedHttpURLLoad("viewport/viewport-87.html");
1663 1663
1664 FrameTestHelpers::WebViewHelper webViewHelper; 1664 FrameTestHelpers::WebViewHelper webViewHelper;
1665 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-87.html", tru e, 0, 0, setViewportSettings); 1665 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-87.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1666 1666
1667 Page* page = webViewHelper.webViewImpl()->page(); 1667 Page* page = webViewHelper.webViewImpl()->page();
1668 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1668 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1669 1669
1670 EXPECT_EQ(64, constraints.layoutSize.width()); 1670 EXPECT_EQ(64, constraints.layoutSize.width());
1671 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 1671 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
1672 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 1672 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
1673 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 1673 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
1674 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1674 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1675 EXPECT_TRUE(page->viewportDescription().userZoom); 1675 EXPECT_TRUE(page->viewportDescription().userZoom);
1676 } 1676 }
1677 1677
1678 TEST_F(ViewportTest, viewport88) 1678 TEST_F(ViewportTest, viewport88)
1679 { 1679 {
1680 registerMockedHttpURLLoad("viewport/viewport-88.html"); 1680 registerMockedHttpURLLoad("viewport/viewport-88.html");
1681 1681
1682 FrameTestHelpers::WebViewHelper webViewHelper; 1682 FrameTestHelpers::WebViewHelper webViewHelper;
1683 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-88.html", tru e, 0, 0, setViewportSettings); 1683 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-88.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1684 1684
1685 Page* page = webViewHelper.webViewImpl()->page(); 1685 Page* page = webViewHelper.webViewImpl()->page();
1686 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1686 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1687 1687
1688 EXPECT_EQ(980, constraints.layoutSize.width()); 1688 EXPECT_EQ(980, constraints.layoutSize.width());
1689 EXPECT_EQ(1078, constraints.layoutSize.height()); 1689 EXPECT_EQ(1078, constraints.layoutSize.height());
1690 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1690 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1691 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1691 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1692 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1692 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1693 EXPECT_TRUE(page->viewportDescription().userZoom); 1693 EXPECT_TRUE(page->viewportDescription().userZoom);
1694 } 1694 }
1695 1695
1696 TEST_F(ViewportTest, viewport90) 1696 TEST_F(ViewportTest, viewport90)
1697 { 1697 {
1698 registerMockedHttpURLLoad("viewport/viewport-90.html"); 1698 registerMockedHttpURLLoad("viewport/viewport-90.html");
1699 1699
1700 FrameTestHelpers::WebViewHelper webViewHelper; 1700 FrameTestHelpers::WebViewHelper webViewHelper;
1701 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-90.html", tru e, 0, 0, setViewportSettings); 1701 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-90.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
1702 1702
1703 Page* page = webViewHelper.webViewImpl()->page(); 1703 Page* page = webViewHelper.webViewImpl()->page();
1704 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1704 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1705 1705
1706 EXPECT_EQ(700, constraints.layoutSize.width()); 1706 EXPECT_EQ(700, constraints.layoutSize.width());
1707 EXPECT_EQ(770, constraints.layoutSize.height()); 1707 EXPECT_EQ(770, constraints.layoutSize.height());
1708 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 1708 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
1709 EXPECT_NEAR(0.46f, constraints.minimumScale, 0.01f); 1709 EXPECT_NEAR(0.46f, constraints.minimumScale, 0.01f);
1710 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1710 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1711 EXPECT_TRUE(page->viewportDescription().userZoom); 1711 EXPECT_TRUE(page->viewportDescription().userZoom);
1712 } 1712 }
1713 1713
1714 TEST_F(ViewportTest, viewport100) 1714 TEST_F(ViewportTest, viewport100)
1715 { 1715 {
1716 registerMockedHttpURLLoad("viewport/viewport-100.html"); 1716 registerMockedHttpURLLoad("viewport/viewport-100.html");
1717 1717
1718 FrameTestHelpers::WebViewHelper webViewHelper; 1718 FrameTestHelpers::WebViewHelper webViewHelper;
1719 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-100.html", tr ue, 0, 0, setViewportSettings); 1719 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-100.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1720 1720
1721 Page* page = webViewHelper.webViewImpl()->page(); 1721 Page* page = webViewHelper.webViewImpl()->page();
1722 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1722 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1723 1723
1724 EXPECT_EQ(400, constraints.layoutSize.width()); 1724 EXPECT_EQ(400, constraints.layoutSize.width());
1725 EXPECT_EQ(440, constraints.layoutSize.height()); 1725 EXPECT_EQ(440, constraints.layoutSize.height());
1726 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1726 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1727 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1727 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1728 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1728 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1729 EXPECT_TRUE(page->viewportDescription().userZoom); 1729 EXPECT_TRUE(page->viewportDescription().userZoom);
1730 } 1730 }
1731 1731
1732 TEST_F(ViewportTest, viewport101) 1732 TEST_F(ViewportTest, viewport101)
1733 { 1733 {
1734 registerMockedHttpURLLoad("viewport/viewport-101.html"); 1734 registerMockedHttpURLLoad("viewport/viewport-101.html");
1735 1735
1736 FrameTestHelpers::WebViewHelper webViewHelper; 1736 FrameTestHelpers::WebViewHelper webViewHelper;
1737 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-101.html", tr ue, 0, 0, setViewportSettings); 1737 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-101.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1738 1738
1739 Page* page = webViewHelper.webViewImpl()->page(); 1739 Page* page = webViewHelper.webViewImpl()->page();
1740 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1740 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1741 1741
1742 EXPECT_EQ(400, constraints.layoutSize.width()); 1742 EXPECT_EQ(400, constraints.layoutSize.width());
1743 EXPECT_EQ(440, constraints.layoutSize.height()); 1743 EXPECT_EQ(440, constraints.layoutSize.height());
1744 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1744 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1745 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1745 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1746 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1746 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1747 EXPECT_TRUE(page->viewportDescription().userZoom); 1747 EXPECT_TRUE(page->viewportDescription().userZoom);
1748 } 1748 }
1749 1749
1750 TEST_F(ViewportTest, viewport102) 1750 TEST_F(ViewportTest, viewport102)
1751 { 1751 {
1752 registerMockedHttpURLLoad("viewport/viewport-102.html"); 1752 registerMockedHttpURLLoad("viewport/viewport-102.html");
1753 1753
1754 FrameTestHelpers::WebViewHelper webViewHelper; 1754 FrameTestHelpers::WebViewHelper webViewHelper;
1755 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-102.html", tr ue, 0, 0, setViewportSettings); 1755 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-102.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1756 1756
1757 Page* page = webViewHelper.webViewImpl()->page(); 1757 Page* page = webViewHelper.webViewImpl()->page();
1758 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1758 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1759 1759
1760 EXPECT_EQ(400, constraints.layoutSize.width()); 1760 EXPECT_EQ(400, constraints.layoutSize.width());
1761 EXPECT_EQ(440, constraints.layoutSize.height()); 1761 EXPECT_EQ(440, constraints.layoutSize.height());
1762 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1762 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1763 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1763 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1764 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1764 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1765 EXPECT_TRUE(page->viewportDescription().userZoom); 1765 EXPECT_TRUE(page->viewportDescription().userZoom);
1766 } 1766 }
1767 1767
1768 TEST_F(ViewportTest, viewport103) 1768 TEST_F(ViewportTest, viewport103)
1769 { 1769 {
1770 registerMockedHttpURLLoad("viewport/viewport-103.html"); 1770 registerMockedHttpURLLoad("viewport/viewport-103.html");
1771 1771
1772 FrameTestHelpers::WebViewHelper webViewHelper; 1772 FrameTestHelpers::WebViewHelper webViewHelper;
1773 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-103.html", tr ue, 0, 0, setViewportSettings); 1773 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-103.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1774 1774
1775 Page* page = webViewHelper.webViewImpl()->page(); 1775 Page* page = webViewHelper.webViewImpl()->page();
1776 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1776 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1777 1777
1778 EXPECT_EQ(400, constraints.layoutSize.width()); 1778 EXPECT_EQ(400, constraints.layoutSize.width());
1779 EXPECT_EQ(440, constraints.layoutSize.height()); 1779 EXPECT_EQ(440, constraints.layoutSize.height());
1780 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1780 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1781 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1781 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1782 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1782 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1783 EXPECT_TRUE(page->viewportDescription().userZoom); 1783 EXPECT_TRUE(page->viewportDescription().userZoom);
1784 } 1784 }
1785 1785
1786 TEST_F(ViewportTest, viewport104) 1786 TEST_F(ViewportTest, viewport104)
1787 { 1787 {
1788 registerMockedHttpURLLoad("viewport/viewport-104.html"); 1788 registerMockedHttpURLLoad("viewport/viewport-104.html");
1789 1789
1790 FrameTestHelpers::WebViewHelper webViewHelper; 1790 FrameTestHelpers::WebViewHelper webViewHelper;
1791 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-104.html", tr ue, 0, 0, setViewportSettings); 1791 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-104.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1792 1792
1793 Page* page = webViewHelper.webViewImpl()->page(); 1793 Page* page = webViewHelper.webViewImpl()->page();
1794 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1794 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1795 1795
1796 EXPECT_EQ(980, constraints.layoutSize.width()); 1796 EXPECT_EQ(980, constraints.layoutSize.width());
1797 EXPECT_EQ(1078, constraints.layoutSize.height()); 1797 EXPECT_EQ(1078, constraints.layoutSize.height());
1798 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1798 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1799 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1799 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1800 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1800 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1801 EXPECT_TRUE(page->viewportDescription().userZoom); 1801 EXPECT_TRUE(page->viewportDescription().userZoom);
1802 } 1802 }
1803 1803
1804 TEST_F(ViewportTest, viewport105) 1804 TEST_F(ViewportTest, viewport105)
1805 { 1805 {
1806 registerMockedHttpURLLoad("viewport/viewport-105.html"); 1806 registerMockedHttpURLLoad("viewport/viewport-105.html");
1807 1807
1808 FrameTestHelpers::WebViewHelper webViewHelper; 1808 FrameTestHelpers::WebViewHelper webViewHelper;
1809 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-105.html", tr ue, 0, 0, setViewportSettings); 1809 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-105.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1810 1810
1811 Page* page = webViewHelper.webViewImpl()->page(); 1811 Page* page = webViewHelper.webViewImpl()->page();
1812 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1812 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1813 1813
1814 EXPECT_EQ(980, constraints.layoutSize.width()); 1814 EXPECT_EQ(980, constraints.layoutSize.width());
1815 EXPECT_EQ(1078, constraints.layoutSize.height()); 1815 EXPECT_EQ(1078, constraints.layoutSize.height());
1816 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1816 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1817 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1817 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1818 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1818 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1819 EXPECT_TRUE(page->viewportDescription().userZoom); 1819 EXPECT_TRUE(page->viewportDescription().userZoom);
1820 } 1820 }
1821 1821
1822 TEST_F(ViewportTest, viewport106) 1822 TEST_F(ViewportTest, viewport106)
1823 { 1823 {
1824 registerMockedHttpURLLoad("viewport/viewport-106.html"); 1824 registerMockedHttpURLLoad("viewport/viewport-106.html");
1825 1825
1826 FrameTestHelpers::WebViewHelper webViewHelper; 1826 FrameTestHelpers::WebViewHelper webViewHelper;
1827 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-106.html", tr ue, 0, 0, setViewportSettings); 1827 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-106.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1828 1828
1829 Page* page = webViewHelper.webViewImpl()->page(); 1829 Page* page = webViewHelper.webViewImpl()->page();
1830 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1830 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1831 1831
1832 EXPECT_EQ(980, constraints.layoutSize.width()); 1832 EXPECT_EQ(980, constraints.layoutSize.width());
1833 EXPECT_EQ(1078, constraints.layoutSize.height()); 1833 EXPECT_EQ(1078, constraints.layoutSize.height());
1834 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1834 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1835 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1835 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1836 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1836 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1837 EXPECT_TRUE(page->viewportDescription().userZoom); 1837 EXPECT_TRUE(page->viewportDescription().userZoom);
1838 } 1838 }
1839 1839
1840 TEST_F(ViewportTest, viewport107) 1840 TEST_F(ViewportTest, viewport107)
1841 { 1841 {
1842 registerMockedHttpURLLoad("viewport/viewport-107.html"); 1842 registerMockedHttpURLLoad("viewport/viewport-107.html");
1843 1843
1844 FrameTestHelpers::WebViewHelper webViewHelper; 1844 FrameTestHelpers::WebViewHelper webViewHelper;
1845 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-107.html", tr ue, 0, 0, setViewportSettings); 1845 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-107.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1846 1846
1847 Page* page = webViewHelper.webViewImpl()->page(); 1847 Page* page = webViewHelper.webViewImpl()->page();
1848 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1848 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1849 1849
1850 EXPECT_EQ(980, constraints.layoutSize.width()); 1850 EXPECT_EQ(980, constraints.layoutSize.width());
1851 EXPECT_EQ(1078, constraints.layoutSize.height()); 1851 EXPECT_EQ(1078, constraints.layoutSize.height());
1852 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1852 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1853 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1853 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1854 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1854 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1855 EXPECT_TRUE(page->viewportDescription().userZoom); 1855 EXPECT_TRUE(page->viewportDescription().userZoom);
1856 } 1856 }
1857 1857
1858 TEST_F(ViewportTest, viewport108) 1858 TEST_F(ViewportTest, viewport108)
1859 { 1859 {
1860 registerMockedHttpURLLoad("viewport/viewport-108.html"); 1860 registerMockedHttpURLLoad("viewport/viewport-108.html");
1861 1861
1862 FrameTestHelpers::WebViewHelper webViewHelper; 1862 FrameTestHelpers::WebViewHelper webViewHelper;
1863 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-108.html", tr ue, 0, 0, setViewportSettings); 1863 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-108.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1864 1864
1865 Page* page = webViewHelper.webViewImpl()->page(); 1865 Page* page = webViewHelper.webViewImpl()->page();
1866 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1866 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1867 1867
1868 EXPECT_EQ(980, constraints.layoutSize.width()); 1868 EXPECT_EQ(980, constraints.layoutSize.width());
1869 EXPECT_EQ(1078, constraints.layoutSize.height()); 1869 EXPECT_EQ(1078, constraints.layoutSize.height());
1870 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1870 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1871 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1871 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1872 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1872 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1873 EXPECT_TRUE(page->viewportDescription().userZoom); 1873 EXPECT_TRUE(page->viewportDescription().userZoom);
1874 } 1874 }
1875 1875
1876 TEST_F(ViewportTest, viewport109) 1876 TEST_F(ViewportTest, viewport109)
1877 { 1877 {
1878 registerMockedHttpURLLoad("viewport/viewport-109.html"); 1878 registerMockedHttpURLLoad("viewport/viewport-109.html");
1879 1879
1880 FrameTestHelpers::WebViewHelper webViewHelper; 1880 FrameTestHelpers::WebViewHelper webViewHelper;
1881 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-109.html", tr ue, 0, 0, setViewportSettings); 1881 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-109.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1882 1882
1883 Page* page = webViewHelper.webViewImpl()->page(); 1883 Page* page = webViewHelper.webViewImpl()->page();
1884 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1884 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1885 1885
1886 EXPECT_EQ(980, constraints.layoutSize.width()); 1886 EXPECT_EQ(980, constraints.layoutSize.width());
1887 EXPECT_EQ(1078, constraints.layoutSize.height()); 1887 EXPECT_EQ(1078, constraints.layoutSize.height());
1888 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1888 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1889 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1889 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1890 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1890 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1891 EXPECT_TRUE(page->viewportDescription().userZoom); 1891 EXPECT_TRUE(page->viewportDescription().userZoom);
1892 } 1892 }
1893 1893
1894 TEST_F(ViewportTest, viewport110) 1894 TEST_F(ViewportTest, viewport110)
1895 { 1895 {
1896 registerMockedHttpURLLoad("viewport/viewport-110.html"); 1896 registerMockedHttpURLLoad("viewport/viewport-110.html");
1897 1897
1898 FrameTestHelpers::WebViewHelper webViewHelper; 1898 FrameTestHelpers::WebViewHelper webViewHelper;
1899 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-110.html", tr ue, 0, 0, setViewportSettings); 1899 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-110.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1900 1900
1901 Page* page = webViewHelper.webViewImpl()->page(); 1901 Page* page = webViewHelper.webViewImpl()->page();
1902 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1902 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1903 1903
1904 EXPECT_EQ(980, constraints.layoutSize.width()); 1904 EXPECT_EQ(980, constraints.layoutSize.width());
1905 EXPECT_EQ(1078, constraints.layoutSize.height()); 1905 EXPECT_EQ(1078, constraints.layoutSize.height());
1906 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1906 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1907 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1907 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1908 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1908 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1909 EXPECT_TRUE(page->viewportDescription().userZoom); 1909 EXPECT_TRUE(page->viewportDescription().userZoom);
1910 } 1910 }
1911 1911
1912 TEST_F(ViewportTest, viewport111) 1912 TEST_F(ViewportTest, viewport111)
1913 { 1913 {
1914 registerMockedHttpURLLoad("viewport/viewport-111.html"); 1914 registerMockedHttpURLLoad("viewport/viewport-111.html");
1915 1915
1916 FrameTestHelpers::WebViewHelper webViewHelper; 1916 FrameTestHelpers::WebViewHelper webViewHelper;
1917 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-111.html", tr ue, 0, 0, setViewportSettings); 1917 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-111.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1918 1918
1919 Page* page = webViewHelper.webViewImpl()->page(); 1919 Page* page = webViewHelper.webViewImpl()->page();
1920 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1920 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1921 1921
1922 EXPECT_EQ(980, constraints.layoutSize.width()); 1922 EXPECT_EQ(980, constraints.layoutSize.width());
1923 EXPECT_EQ(1078, constraints.layoutSize.height()); 1923 EXPECT_EQ(1078, constraints.layoutSize.height());
1924 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1924 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1925 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1925 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1926 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1926 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1927 EXPECT_TRUE(page->viewportDescription().userZoom); 1927 EXPECT_TRUE(page->viewportDescription().userZoom);
1928 } 1928 }
1929 1929
1930 TEST_F(ViewportTest, viewport112) 1930 TEST_F(ViewportTest, viewport112)
1931 { 1931 {
1932 registerMockedHttpURLLoad("viewport/viewport-112.html"); 1932 registerMockedHttpURLLoad("viewport/viewport-112.html");
1933 1933
1934 FrameTestHelpers::WebViewHelper webViewHelper; 1934 FrameTestHelpers::WebViewHelper webViewHelper;
1935 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-112.html", tr ue, 0, 0, setViewportSettings); 1935 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-112.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1936 1936
1937 Page* page = webViewHelper.webViewImpl()->page(); 1937 Page* page = webViewHelper.webViewImpl()->page();
1938 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1938 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1939 1939
1940 EXPECT_EQ(400, constraints.layoutSize.width()); 1940 EXPECT_EQ(400, constraints.layoutSize.width());
1941 EXPECT_EQ(440, constraints.layoutSize.height()); 1941 EXPECT_EQ(440, constraints.layoutSize.height());
1942 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1942 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1943 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1943 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1944 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1944 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1945 EXPECT_TRUE(page->viewportDescription().userZoom); 1945 EXPECT_TRUE(page->viewportDescription().userZoom);
1946 } 1946 }
1947 1947
1948 TEST_F(ViewportTest, viewport113) 1948 TEST_F(ViewportTest, viewport113)
1949 { 1949 {
1950 registerMockedHttpURLLoad("viewport/viewport-113.html"); 1950 registerMockedHttpURLLoad("viewport/viewport-113.html");
1951 1951
1952 FrameTestHelpers::WebViewHelper webViewHelper; 1952 FrameTestHelpers::WebViewHelper webViewHelper;
1953 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-113.html", tr ue, 0, 0, setViewportSettings); 1953 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-113.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1954 1954
1955 Page* page = webViewHelper.webViewImpl()->page(); 1955 Page* page = webViewHelper.webViewImpl()->page();
1956 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1956 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1957 1957
1958 EXPECT_EQ(980, constraints.layoutSize.width()); 1958 EXPECT_EQ(980, constraints.layoutSize.width());
1959 EXPECT_EQ(1078, constraints.layoutSize.height()); 1959 EXPECT_EQ(1078, constraints.layoutSize.height());
1960 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1960 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1961 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1961 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1962 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1962 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1963 EXPECT_TRUE(page->viewportDescription().userZoom); 1963 EXPECT_TRUE(page->viewportDescription().userZoom);
1964 } 1964 }
1965 1965
1966 TEST_F(ViewportTest, viewport114) 1966 TEST_F(ViewportTest, viewport114)
1967 { 1967 {
1968 registerMockedHttpURLLoad("viewport/viewport-114.html"); 1968 registerMockedHttpURLLoad("viewport/viewport-114.html");
1969 1969
1970 FrameTestHelpers::WebViewHelper webViewHelper; 1970 FrameTestHelpers::WebViewHelper webViewHelper;
1971 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-114.html", tr ue, 0, 0, setViewportSettings); 1971 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-114.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1972 1972
1973 Page* page = webViewHelper.webViewImpl()->page(); 1973 Page* page = webViewHelper.webViewImpl()->page();
1974 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1974 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1975 1975
1976 EXPECT_EQ(980, constraints.layoutSize.width()); 1976 EXPECT_EQ(980, constraints.layoutSize.width());
1977 EXPECT_EQ(1078, constraints.layoutSize.height()); 1977 EXPECT_EQ(1078, constraints.layoutSize.height());
1978 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 1978 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
1979 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 1979 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
1980 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1980 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1981 EXPECT_TRUE(page->viewportDescription().userZoom); 1981 EXPECT_TRUE(page->viewportDescription().userZoom);
1982 } 1982 }
1983 1983
1984 TEST_F(ViewportTest, viewport115) 1984 TEST_F(ViewportTest, viewport115)
1985 { 1985 {
1986 registerMockedHttpURLLoad("viewport/viewport-115.html"); 1986 registerMockedHttpURLLoad("viewport/viewport-115.html");
1987 1987
1988 FrameTestHelpers::WebViewHelper webViewHelper; 1988 FrameTestHelpers::WebViewHelper webViewHelper;
1989 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-115.html", tr ue, 0, 0, setViewportSettings); 1989 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-115.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
1990 1990
1991 Page* page = webViewHelper.webViewImpl()->page(); 1991 Page* page = webViewHelper.webViewImpl()->page();
1992 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 1992 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
1993 1993
1994 EXPECT_EQ(400, constraints.layoutSize.width()); 1994 EXPECT_EQ(400, constraints.layoutSize.width());
1995 EXPECT_EQ(440, constraints.layoutSize.height()); 1995 EXPECT_EQ(440, constraints.layoutSize.height());
1996 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 1996 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
1997 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 1997 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
1998 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 1998 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
1999 EXPECT_TRUE(page->viewportDescription().userZoom); 1999 EXPECT_TRUE(page->viewportDescription().userZoom);
2000 } 2000 }
2001 2001
2002 TEST_F(ViewportTest, viewport116) 2002 TEST_F(ViewportTest, viewport116)
2003 { 2003 {
2004 registerMockedHttpURLLoad("viewport/viewport-116.html"); 2004 registerMockedHttpURLLoad("viewport/viewport-116.html");
2005 2005
2006 FrameTestHelpers::WebViewHelper webViewHelper; 2006 FrameTestHelpers::WebViewHelper webViewHelper;
2007 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-116.html", tr ue, 0, 0, setViewportSettings); 2007 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-116.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2008 2008
2009 Page* page = webViewHelper.webViewImpl()->page(); 2009 Page* page = webViewHelper.webViewImpl()->page();
2010 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2010 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2011 2011
2012 EXPECT_EQ(400, constraints.layoutSize.width()); 2012 EXPECT_EQ(400, constraints.layoutSize.width());
2013 EXPECT_EQ(440, constraints.layoutSize.height()); 2013 EXPECT_EQ(440, constraints.layoutSize.height());
2014 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f); 2014 EXPECT_NEAR(0.8f, constraints.initialScale, 0.01f);
2015 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f); 2015 EXPECT_NEAR(0.8f, constraints.minimumScale, 0.01f);
2016 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2016 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2017 EXPECT_TRUE(page->viewportDescription().userZoom); 2017 EXPECT_TRUE(page->viewportDescription().userZoom);
2018 } 2018 }
2019 2019
2020 TEST_F(ViewportTest, viewport117) 2020 TEST_F(ViewportTest, viewport117)
2021 { 2021 {
2022 registerMockedHttpURLLoad("viewport/viewport-117.html"); 2022 registerMockedHttpURLLoad("viewport/viewport-117.html");
2023 2023
2024 FrameTestHelpers::WebViewHelper webViewHelper; 2024 FrameTestHelpers::WebViewHelper webViewHelper;
2025 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-117.html", tr ue, 0, 0, setViewportSettings); 2025 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-117.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2026 2026
2027 Page* page = webViewHelper.webViewImpl()->page(); 2027 Page* page = webViewHelper.webViewImpl()->page();
2028 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2028 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2029 2029
2030 EXPECT_EQ(980, constraints.layoutSize.width()); 2030 EXPECT_EQ(980, constraints.layoutSize.width());
2031 EXPECT_EQ(400, constraints.layoutSize.height()); 2031 EXPECT_EQ(400, constraints.layoutSize.height());
2032 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 2032 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
2033 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 2033 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
2034 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2034 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2035 EXPECT_TRUE(page->viewportDescription().userZoom); 2035 EXPECT_TRUE(page->viewportDescription().userZoom);
2036 } 2036 }
2037 2037
2038 TEST_F(ViewportTest, viewport118) 2038 TEST_F(ViewportTest, viewport118)
2039 { 2039 {
2040 registerMockedHttpURLLoad("viewport/viewport-118.html"); 2040 registerMockedHttpURLLoad("viewport/viewport-118.html");
2041 2041
2042 FrameTestHelpers::WebViewHelper webViewHelper; 2042 FrameTestHelpers::WebViewHelper webViewHelper;
2043 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-118.html", tr ue, 0, 0, setViewportSettings); 2043 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-118.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2044 2044
2045 Page* page = webViewHelper.webViewImpl()->page(); 2045 Page* page = webViewHelper.webViewImpl()->page();
2046 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2046 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2047 2047
2048 EXPECT_EQ(320, constraints.layoutSize.width()); 2048 EXPECT_EQ(320, constraints.layoutSize.width());
2049 EXPECT_EQ(352, constraints.layoutSize.height()); 2049 EXPECT_EQ(352, constraints.layoutSize.height());
2050 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2050 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2051 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2051 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2052 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2052 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2053 EXPECT_TRUE(page->viewportDescription().userZoom); 2053 EXPECT_TRUE(page->viewportDescription().userZoom);
2054 } 2054 }
2055 2055
2056 TEST_F(ViewportTest, viewport119) 2056 TEST_F(ViewportTest, viewport119)
2057 { 2057 {
2058 registerMockedHttpURLLoad("viewport/viewport-119.html"); 2058 registerMockedHttpURLLoad("viewport/viewport-119.html");
2059 2059
2060 FrameTestHelpers::WebViewHelper webViewHelper; 2060 FrameTestHelpers::WebViewHelper webViewHelper;
2061 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-119.html", tr ue, 0, 0, setViewportSettings); 2061 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-119.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2062 2062
2063 Page* page = webViewHelper.webViewImpl()->page(); 2063 Page* page = webViewHelper.webViewImpl()->page();
2064 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2064 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2065 2065
2066 EXPECT_EQ(320, constraints.layoutSize.width()); 2066 EXPECT_EQ(320, constraints.layoutSize.width());
2067 EXPECT_EQ(352, constraints.layoutSize.height()); 2067 EXPECT_EQ(352, constraints.layoutSize.height());
2068 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2068 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2069 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2069 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2070 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2070 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2071 EXPECT_TRUE(page->viewportDescription().userZoom); 2071 EXPECT_TRUE(page->viewportDescription().userZoom);
2072 } 2072 }
2073 2073
2074 TEST_F(ViewportTest, viewport120) 2074 TEST_F(ViewportTest, viewport120)
2075 { 2075 {
2076 registerMockedHttpURLLoad("viewport/viewport-120.html"); 2076 registerMockedHttpURLLoad("viewport/viewport-120.html");
2077 2077
2078 FrameTestHelpers::WebViewHelper webViewHelper; 2078 FrameTestHelpers::WebViewHelper webViewHelper;
2079 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-120.html", tr ue, 0, 0, setViewportSettings); 2079 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-120.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2080 2080
2081 Page* page = webViewHelper.webViewImpl()->page(); 2081 Page* page = webViewHelper.webViewImpl()->page();
2082 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2082 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2083 2083
2084 EXPECT_EQ(320, constraints.layoutSize.width()); 2084 EXPECT_EQ(320, constraints.layoutSize.width());
2085 EXPECT_EQ(352, constraints.layoutSize.height()); 2085 EXPECT_EQ(352, constraints.layoutSize.height());
2086 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2086 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2087 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2087 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2088 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2088 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2089 EXPECT_TRUE(page->viewportDescription().userZoom); 2089 EXPECT_TRUE(page->viewportDescription().userZoom);
2090 } 2090 }
2091 2091
2092 TEST_F(ViewportTest, viewport121) 2092 TEST_F(ViewportTest, viewport121)
2093 { 2093 {
2094 registerMockedHttpURLLoad("viewport/viewport-121.html"); 2094 registerMockedHttpURLLoad("viewport/viewport-121.html");
2095 2095
2096 FrameTestHelpers::WebViewHelper webViewHelper; 2096 FrameTestHelpers::WebViewHelper webViewHelper;
2097 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-121.html", tr ue, 0, 0, setViewportSettings); 2097 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-121.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2098 2098
2099 Page* page = webViewHelper.webViewImpl()->page(); 2099 Page* page = webViewHelper.webViewImpl()->page();
2100 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2100 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2101 2101
2102 EXPECT_EQ(64, constraints.layoutSize.width()); 2102 EXPECT_EQ(64, constraints.layoutSize.width());
2103 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 2103 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
2104 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2104 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2105 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2105 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2106 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2106 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2107 EXPECT_TRUE(page->viewportDescription().userZoom); 2107 EXPECT_TRUE(page->viewportDescription().userZoom);
2108 } 2108 }
2109 2109
2110 TEST_F(ViewportTest, viewport122) 2110 TEST_F(ViewportTest, viewport122)
2111 { 2111 {
2112 registerMockedHttpURLLoad("viewport/viewport-122.html"); 2112 registerMockedHttpURLLoad("viewport/viewport-122.html");
2113 2113
2114 FrameTestHelpers::WebViewHelper webViewHelper; 2114 FrameTestHelpers::WebViewHelper webViewHelper;
2115 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-122.html", tr ue, 0, 0, setViewportSettings); 2115 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-122.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2116 2116
2117 Page* page = webViewHelper.webViewImpl()->page(); 2117 Page* page = webViewHelper.webViewImpl()->page();
2118 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2118 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2119 2119
2120 EXPECT_EQ(64, constraints.layoutSize.width()); 2120 EXPECT_EQ(64, constraints.layoutSize.width());
2121 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 2121 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
2122 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2122 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2123 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2123 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2124 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2124 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2125 EXPECT_TRUE(page->viewportDescription().userZoom); 2125 EXPECT_TRUE(page->viewportDescription().userZoom);
2126 } 2126 }
2127 2127
2128 TEST_F(ViewportTest, viewport123) 2128 TEST_F(ViewportTest, viewport123)
2129 { 2129 {
2130 registerMockedHttpURLLoad("viewport/viewport-123.html"); 2130 registerMockedHttpURLLoad("viewport/viewport-123.html");
2131 2131
2132 FrameTestHelpers::WebViewHelper webViewHelper; 2132 FrameTestHelpers::WebViewHelper webViewHelper;
2133 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-123.html", tr ue, 0, 0, setViewportSettings); 2133 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-123.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2134 2134
2135 Page* page = webViewHelper.webViewImpl()->page(); 2135 Page* page = webViewHelper.webViewImpl()->page();
2136 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2136 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2137 2137
2138 EXPECT_EQ(320, constraints.layoutSize.width()); 2138 EXPECT_EQ(320, constraints.layoutSize.width());
2139 EXPECT_EQ(352, constraints.layoutSize.height()); 2139 EXPECT_EQ(352, constraints.layoutSize.height());
2140 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2140 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2141 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2141 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2142 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2142 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2143 EXPECT_TRUE(page->viewportDescription().userZoom); 2143 EXPECT_TRUE(page->viewportDescription().userZoom);
2144 } 2144 }
2145 2145
2146 TEST_F(ViewportTest, viewport124) 2146 TEST_F(ViewportTest, viewport124)
2147 { 2147 {
2148 registerMockedHttpURLLoad("viewport/viewport-124.html"); 2148 registerMockedHttpURLLoad("viewport/viewport-124.html");
2149 2149
2150 FrameTestHelpers::WebViewHelper webViewHelper; 2150 FrameTestHelpers::WebViewHelper webViewHelper;
2151 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-124.html", tr ue, 0, 0, setViewportSettings); 2151 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-124.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2152 2152
2153 Page* page = webViewHelper.webViewImpl()->page(); 2153 Page* page = webViewHelper.webViewImpl()->page();
2154 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2154 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2155 2155
2156 EXPECT_EQ(320, constraints.layoutSize.width()); 2156 EXPECT_EQ(320, constraints.layoutSize.width());
2157 EXPECT_EQ(352, constraints.layoutSize.height()); 2157 EXPECT_EQ(352, constraints.layoutSize.height());
2158 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2158 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2159 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2159 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2160 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2160 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2161 EXPECT_TRUE(page->viewportDescription().userZoom); 2161 EXPECT_TRUE(page->viewportDescription().userZoom);
2162 } 2162 }
2163 2163
2164 TEST_F(ViewportTest, viewport125) 2164 TEST_F(ViewportTest, viewport125)
2165 { 2165 {
2166 registerMockedHttpURLLoad("viewport/viewport-125.html"); 2166 registerMockedHttpURLLoad("viewport/viewport-125.html");
2167 2167
2168 FrameTestHelpers::WebViewHelper webViewHelper; 2168 FrameTestHelpers::WebViewHelper webViewHelper;
2169 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-125.html", tr ue, 0, 0, setViewportSettings); 2169 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-125.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2170 2170
2171 Page* page = webViewHelper.webViewImpl()->page(); 2171 Page* page = webViewHelper.webViewImpl()->page();
2172 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2172 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2173 2173
2174 EXPECT_EQ(64, constraints.layoutSize.width()); 2174 EXPECT_EQ(64, constraints.layoutSize.width());
2175 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 2175 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
2176 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2176 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2177 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2177 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2178 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2178 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2179 EXPECT_TRUE(page->viewportDescription().userZoom); 2179 EXPECT_TRUE(page->viewportDescription().userZoom);
2180 } 2180 }
2181 2181
2182 TEST_F(ViewportTest, viewport126) 2182 TEST_F(ViewportTest, viewport126)
2183 { 2183 {
2184 registerMockedHttpURLLoad("viewport/viewport-126.html"); 2184 registerMockedHttpURLLoad("viewport/viewport-126.html");
2185 2185
2186 FrameTestHelpers::WebViewHelper webViewHelper; 2186 FrameTestHelpers::WebViewHelper webViewHelper;
2187 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-126.html", tr ue, 0, 0, setViewportSettings); 2187 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-126.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2188 2188
2189 Page* page = webViewHelper.webViewImpl()->page(); 2189 Page* page = webViewHelper.webViewImpl()->page();
2190 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2190 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2191 2191
2192 EXPECT_EQ(64, constraints.layoutSize.width()); 2192 EXPECT_EQ(64, constraints.layoutSize.width());
2193 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 2193 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
2194 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2194 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2195 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2195 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2196 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2196 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2197 EXPECT_TRUE(page->viewportDescription().userZoom); 2197 EXPECT_TRUE(page->viewportDescription().userZoom);
2198 } 2198 }
2199 2199
2200 TEST_F(ViewportTest, viewport127) 2200 TEST_F(ViewportTest, viewport127)
2201 { 2201 {
2202 registerMockedHttpURLLoad("viewport/viewport-127.html"); 2202 registerMockedHttpURLLoad("viewport/viewport-127.html");
2203 2203
2204 FrameTestHelpers::WebViewHelper webViewHelper; 2204 FrameTestHelpers::WebViewHelper webViewHelper;
2205 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-127.html", tr ue, 0, 0, setViewportSettings); 2205 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-127.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2206 2206
2207 Page* page = webViewHelper.webViewImpl()->page(); 2207 Page* page = webViewHelper.webViewImpl()->page();
2208 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2208 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2209 2209
2210 EXPECT_EQ(64, constraints.layoutSize.width()); 2210 EXPECT_EQ(64, constraints.layoutSize.width());
2211 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); 2211 EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f);
2212 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2212 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2213 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2213 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2214 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2214 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2215 EXPECT_TRUE(page->viewportDescription().userZoom); 2215 EXPECT_TRUE(page->viewportDescription().userZoom);
2216 } 2216 }
2217 2217
2218 TEST_F(ViewportTest, viewport129) 2218 TEST_F(ViewportTest, viewport129)
2219 { 2219 {
2220 registerMockedHttpURLLoad("viewport/viewport-129.html"); 2220 registerMockedHttpURLLoad("viewport/viewport-129.html");
2221 2221
2222 FrameTestHelpers::WebViewHelper webViewHelper; 2222 FrameTestHelpers::WebViewHelper webViewHelper;
2223 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-129.html", tr ue, 0, 0, setViewportSettings); 2223 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-129.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2224 2224
2225 Page* page = webViewHelper.webViewImpl()->page(); 2225 Page* page = webViewHelper.webViewImpl()->page();
2226 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2226 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2227 2227
2228 EXPECT_EQ(123, constraints.layoutSize.width()); 2228 EXPECT_EQ(123, constraints.layoutSize.width());
2229 EXPECT_NEAR(135.3, constraints.layoutSize.height(), 0.01f); 2229 EXPECT_NEAR(135.3, constraints.layoutSize.height(), 0.01f);
2230 EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f); 2230 EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f);
2231 EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f); 2231 EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f);
2232 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2232 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2233 EXPECT_TRUE(page->viewportDescription().userZoom); 2233 EXPECT_TRUE(page->viewportDescription().userZoom);
2234 } 2234 }
2235 2235
2236 TEST_F(ViewportTest, viewport130) 2236 TEST_F(ViewportTest, viewport130)
2237 { 2237 {
2238 registerMockedHttpURLLoad("viewport/viewport-130.html"); 2238 registerMockedHttpURLLoad("viewport/viewport-130.html");
2239 2239
2240 FrameTestHelpers::WebViewHelper webViewHelper; 2240 FrameTestHelpers::WebViewHelper webViewHelper;
2241 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-130.html", tr ue, 0, 0, setViewportSettings); 2241 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-130.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2242 2242
2243 Page* page = webViewHelper.webViewImpl()->page(); 2243 Page* page = webViewHelper.webViewImpl()->page();
2244 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2244 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2245 2245
2246 EXPECT_EQ(320, constraints.layoutSize.width()); 2246 EXPECT_EQ(320, constraints.layoutSize.width());
2247 EXPECT_EQ(352, constraints.layoutSize.height()); 2247 EXPECT_EQ(352, constraints.layoutSize.height());
2248 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2248 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2249 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2249 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2250 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2250 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2251 EXPECT_TRUE(page->viewportDescription().userZoom); 2251 EXPECT_TRUE(page->viewportDescription().userZoom);
2252 } 2252 }
2253 2253
2254 TEST_F(ViewportTest, viewport131) 2254 TEST_F(ViewportTest, viewport131)
2255 { 2255 {
2256 registerMockedHttpURLLoad("viewport/viewport-131.html"); 2256 registerMockedHttpURLLoad("viewport/viewport-131.html");
2257 2257
2258 FrameTestHelpers::WebViewHelper webViewHelper; 2258 FrameTestHelpers::WebViewHelper webViewHelper;
2259 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-131.html", tr ue, 0, 0, setViewportSettings); 2259 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-131.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2260 2260
2261 Page* page = webViewHelper.webViewImpl()->page(); 2261 Page* page = webViewHelper.webViewImpl()->page();
2262 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2262 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2263 2263
2264 EXPECT_EQ(320, constraints.layoutSize.width()); 2264 EXPECT_EQ(320, constraints.layoutSize.width());
2265 EXPECT_EQ(352, constraints.layoutSize.height()); 2265 EXPECT_EQ(352, constraints.layoutSize.height());
2266 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2266 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2267 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2267 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2268 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f); 2268 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f);
2269 EXPECT_FALSE(page->viewportDescription().userZoom); 2269 EXPECT_FALSE(page->viewportDescription().userZoom);
2270 } 2270 }
2271 2271
2272 TEST_F(ViewportTest, viewport132) 2272 TEST_F(ViewportTest, viewport132)
2273 { 2273 {
2274 registerMockedHttpURLLoad("viewport/viewport-132.html"); 2274 registerMockedHttpURLLoad("viewport/viewport-132.html");
2275 2275
2276 FrameTestHelpers::WebViewHelper webViewHelper; 2276 FrameTestHelpers::WebViewHelper webViewHelper;
2277 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-132.html", tr ue, 0, 0, setViewportSettings); 2277 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-132.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2278 2278
2279 Page* page = webViewHelper.webViewImpl()->page(); 2279 Page* page = webViewHelper.webViewImpl()->page();
2280 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2280 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2281 2281
2282 EXPECT_EQ(320, constraints.layoutSize.width()); 2282 EXPECT_EQ(320, constraints.layoutSize.width());
2283 EXPECT_EQ(352, constraints.layoutSize.height()); 2283 EXPECT_EQ(352, constraints.layoutSize.height());
2284 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2284 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2285 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2285 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2286 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2286 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2287 EXPECT_TRUE(page->viewportDescription().userZoom); 2287 EXPECT_TRUE(page->viewportDescription().userZoom);
2288 } 2288 }
2289 2289
2290 TEST_F(ViewportTest, viewport133) 2290 TEST_F(ViewportTest, viewport133)
2291 { 2291 {
2292 registerMockedHttpURLLoad("viewport/viewport-133.html"); 2292 registerMockedHttpURLLoad("viewport/viewport-133.html");
2293 2293
2294 FrameTestHelpers::WebViewHelper webViewHelper; 2294 FrameTestHelpers::WebViewHelper webViewHelper;
2295 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-133.html", tr ue, 0, 0, setViewportSettings); 2295 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-133.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2296 2296
2297 Page* page = webViewHelper.webViewImpl()->page(); 2297 Page* page = webViewHelper.webViewImpl()->page();
2298 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2298 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2299 2299
2300 EXPECT_EQ(980, constraints.layoutSize.width()); 2300 EXPECT_EQ(980, constraints.layoutSize.width());
2301 EXPECT_EQ(1078, constraints.layoutSize.height()); 2301 EXPECT_EQ(1078, constraints.layoutSize.height());
2302 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f); 2302 EXPECT_NEAR(10.0f, constraints.initialScale, 0.01f);
2303 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f); 2303 EXPECT_NEAR(10.0f, constraints.minimumScale, 0.01f);
2304 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f); 2304 EXPECT_NEAR(10.0f, constraints.maximumScale, 0.01f);
2305 EXPECT_TRUE(page->viewportDescription().userZoom); 2305 EXPECT_TRUE(page->viewportDescription().userZoom);
2306 } 2306 }
2307 2307
2308 TEST_F(ViewportTest, viewport134) 2308 TEST_F(ViewportTest, viewport134)
2309 { 2309 {
2310 registerMockedHttpURLLoad("viewport/viewport-134.html"); 2310 registerMockedHttpURLLoad("viewport/viewport-134.html");
2311 2311
2312 FrameTestHelpers::WebViewHelper webViewHelper; 2312 FrameTestHelpers::WebViewHelper webViewHelper;
2313 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-134.html", tr ue, 0, 0, setViewportSettings); 2313 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-134.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2314 2314
2315 Page* page = webViewHelper.webViewImpl()->page(); 2315 Page* page = webViewHelper.webViewImpl()->page();
2316 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2316 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2317 2317
2318 EXPECT_EQ(160, constraints.layoutSize.width()); 2318 EXPECT_EQ(160, constraints.layoutSize.width());
2319 EXPECT_EQ(176, constraints.layoutSize.height()); 2319 EXPECT_EQ(176, constraints.layoutSize.height());
2320 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f); 2320 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f);
2321 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f); 2321 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f);
2322 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2322 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2323 EXPECT_TRUE(page->viewportDescription().userZoom); 2323 EXPECT_TRUE(page->viewportDescription().userZoom);
2324 } 2324 }
2325 2325
2326 TEST_F(ViewportTest, viewport135) 2326 TEST_F(ViewportTest, viewport135)
2327 { 2327 {
2328 registerMockedHttpURLLoad("viewport/viewport-135.html"); 2328 registerMockedHttpURLLoad("viewport/viewport-135.html");
2329 2329
2330 FrameTestHelpers::WebViewHelper webViewHelper; 2330 FrameTestHelpers::WebViewHelper webViewHelper;
2331 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-135.html", tr ue, 0, 0, setViewportSettings); 2331 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-135.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2332 2332
2333 Page* page = webViewHelper.webViewImpl()->page(); 2333 Page* page = webViewHelper.webViewImpl()->page();
2334 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2334 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2335 2335
2336 EXPECT_EQ(980, constraints.layoutSize.width()); 2336 EXPECT_EQ(980, constraints.layoutSize.width());
2337 EXPECT_EQ(1078, constraints.layoutSize.height()); 2337 EXPECT_EQ(1078, constraints.layoutSize.height());
2338 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 2338 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
2339 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 2339 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
2340 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2340 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2341 EXPECT_TRUE(page->viewportDescription().userZoom); 2341 EXPECT_TRUE(page->viewportDescription().userZoom);
2342 } 2342 }
2343 2343
2344 TEST_F(ViewportTest, viewport136) 2344 TEST_F(ViewportTest, viewport136)
2345 { 2345 {
2346 registerMockedHttpURLLoad("viewport/viewport-136.html"); 2346 registerMockedHttpURLLoad("viewport/viewport-136.html");
2347 2347
2348 FrameTestHelpers::WebViewHelper webViewHelper; 2348 FrameTestHelpers::WebViewHelper webViewHelper;
2349 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-136.html", tr ue, 0, 0, setViewportSettings); 2349 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-136.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2350 2350
2351 Page* page = webViewHelper.webViewImpl()->page(); 2351 Page* page = webViewHelper.webViewImpl()->page();
2352 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2352 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2353 2353
2354 EXPECT_EQ(320, constraints.layoutSize.width()); 2354 EXPECT_EQ(320, constraints.layoutSize.width());
2355 EXPECT_EQ(352, constraints.layoutSize.height()); 2355 EXPECT_EQ(352, constraints.layoutSize.height());
2356 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2356 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2357 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2357 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2358 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2358 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2359 EXPECT_TRUE(page->viewportDescription().userZoom); 2359 EXPECT_TRUE(page->viewportDescription().userZoom);
2360 } 2360 }
2361 2361
2362 TEST_F(ViewportTest, viewport137) 2362 TEST_F(ViewportTest, viewport137)
2363 { 2363 {
2364 registerMockedHttpURLLoad("viewport/viewport-137.html"); 2364 registerMockedHttpURLLoad("viewport/viewport-137.html");
2365 2365
2366 FrameTestHelpers::WebViewHelper webViewHelper; 2366 FrameTestHelpers::WebViewHelper webViewHelper;
2367 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-137.html", tr ue, 0, 0, setViewportSettings); 2367 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-137.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2368 2368
2369 Page* page = webViewHelper.webViewImpl()->page(); 2369 Page* page = webViewHelper.webViewImpl()->page();
2370 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2370 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2371 2371
2372 EXPECT_EQ(980, constraints.layoutSize.width()); 2372 EXPECT_EQ(980, constraints.layoutSize.width());
2373 EXPECT_EQ(1078, constraints.layoutSize.height()); 2373 EXPECT_EQ(1078, constraints.layoutSize.height());
2374 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 2374 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
2375 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 2375 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
2376 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2376 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2377 EXPECT_TRUE(page->viewportDescription().userZoom); 2377 EXPECT_TRUE(page->viewportDescription().userZoom);
2378 } 2378 }
2379 2379
2380 TEST_F(ViewportTest, viewport138) 2380 TEST_F(ViewportTest, viewport138)
2381 { 2381 {
2382 registerMockedHttpURLLoad("viewport/viewport-138.html"); 2382 registerMockedHttpURLLoad("viewport/viewport-138.html");
2383 2383
2384 FrameTestHelpers::WebViewHelper webViewHelper; 2384 FrameTestHelpers::WebViewHelper webViewHelper;
2385 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-138.html", tr ue, 0, 0, setViewportSettings); 2385 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-138.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2386 2386
2387 Page* page = webViewHelper.webViewImpl()->page(); 2387 Page* page = webViewHelper.webViewImpl()->page();
2388 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2388 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2389 2389
2390 EXPECT_NEAR(123.0f, constraints.layoutSize.width(), 0.01); 2390 EXPECT_NEAR(123.0f, constraints.layoutSize.width(), 0.01);
2391 EXPECT_NEAR(135.3f, constraints.layoutSize.height(), 0.01); 2391 EXPECT_NEAR(135.3f, constraints.layoutSize.height(), 0.01);
2392 EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f); 2392 EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f);
2393 EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f); 2393 EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f);
2394 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2394 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2395 EXPECT_TRUE(page->viewportDescription().userZoom); 2395 EXPECT_TRUE(page->viewportDescription().userZoom);
2396 } 2396 }
2397 2397
2398 TEST_F(ViewportTest, viewportLegacyHandheldFriendly) 2398 TEST_F(ViewportTest, viewportLegacyHandheldFriendly)
2399 { 2399 {
2400 registerMockedHttpURLLoad("viewport/viewport-legacy-handheldfriendly.html"); 2400 registerMockedHttpURLLoad("viewport/viewport-legacy-handheldfriendly.html");
2401 2401
2402 FrameTestHelpers::WebViewHelper webViewHelper; 2402 FrameTestHelpers::WebViewHelper webViewHelper;
2403 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-handhe ldfriendly.html", true, 0, 0, setViewportSettings); 2403 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-handhe ldfriendly.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2404 2404
2405 Page* page = webViewHelper.webViewImpl()->page(); 2405 Page* page = webViewHelper.webViewImpl()->page();
2406 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2406 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2407 2407
2408 EXPECT_EQ(320, constraints.layoutSize.width()); 2408 EXPECT_EQ(320, constraints.layoutSize.width());
2409 EXPECT_EQ(352, constraints.layoutSize.height()); 2409 EXPECT_EQ(352, constraints.layoutSize.height());
2410 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2410 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2411 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2411 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2412 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2412 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2413 EXPECT_TRUE(page->viewportDescription().userZoom); 2413 EXPECT_TRUE(page->viewportDescription().userZoom);
2414 } 2414 }
2415 2415
2416 static void setQuirkViewportSettings(WebSettings* settings) 2416 static void setQuirkViewportSettings(WebSettings* settings)
2417 { 2417 {
2418 setViewportSettings(settings); 2418 setViewportSettings(settings);
2419 2419
2420 // This quirk allows content attributes of meta viewport tags to be merged. 2420 // This quirk allows content attributes of meta viewport tags to be merged.
2421 settings->setViewportMetaMergeContentQuirk(true); 2421 settings->setViewportMetaMergeContentQuirk(true);
2422 } 2422 }
2423 2423
2424 TEST_F(ViewportTest, viewportLegacyMergeQuirk1) 2424 TEST_F(ViewportTest, viewportLegacyMergeQuirk1)
2425 { 2425 {
2426 registerMockedHttpURLLoad("viewport/viewport-legacy-merge-quirk-1.html"); 2426 registerMockedHttpURLLoad("viewport/viewport-legacy-merge-quirk-1.html");
2427 2427
2428 FrameTestHelpers::WebViewHelper webViewHelper; 2428 FrameTestHelpers::WebViewHelper webViewHelper;
2429 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-merge- quirk-1.html", true, 0, 0, setQuirkViewportSettings); 2429 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-merge- quirk-1.html", true, nullptr, nullptr, nullptr, setQuirkViewportSettings);
2430 2430
2431 Page* page = webViewHelper.webViewImpl()->page(); 2431 Page* page = webViewHelper.webViewImpl()->page();
2432 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2432 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2433 2433
2434 EXPECT_EQ(640, constraints.layoutSize.width()); 2434 EXPECT_EQ(640, constraints.layoutSize.width());
2435 EXPECT_EQ(704, constraints.layoutSize.height()); 2435 EXPECT_EQ(704, constraints.layoutSize.height());
2436 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2436 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2437 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2437 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2438 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f); 2438 EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f);
2439 EXPECT_FALSE(page->viewportDescription().userZoom); 2439 EXPECT_FALSE(page->viewportDescription().userZoom);
2440 } 2440 }
2441 2441
2442 TEST_F(ViewportTest, viewportLegacyMergeQuirk2) 2442 TEST_F(ViewportTest, viewportLegacyMergeQuirk2)
2443 { 2443 {
2444 registerMockedHttpURLLoad("viewport/viewport-legacy-merge-quirk-2.html"); 2444 registerMockedHttpURLLoad("viewport/viewport-legacy-merge-quirk-2.html");
2445 2445
2446 FrameTestHelpers::WebViewHelper webViewHelper; 2446 FrameTestHelpers::WebViewHelper webViewHelper;
2447 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-merge- quirk-2.html", true, 0, 0, setQuirkViewportSettings); 2447 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-merge- quirk-2.html", true, nullptr, nullptr, nullptr, setQuirkViewportSettings);
2448 2448
2449 Page* page = webViewHelper.webViewImpl()->page(); 2449 Page* page = webViewHelper.webViewImpl()->page();
2450 2450
2451 // This quirk allows content attributes of meta viewport tags to be merged. 2451 // This quirk allows content attributes of meta viewport tags to be merged.
2452 page->settings().setViewportMetaMergeContentQuirk(true); 2452 page->settings().setViewportMetaMergeContentQuirk(true);
2453 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2453 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2454 2454
2455 EXPECT_EQ(500, constraints.layoutSize.width()); 2455 EXPECT_EQ(500, constraints.layoutSize.width());
2456 EXPECT_EQ(550, constraints.layoutSize.height()); 2456 EXPECT_EQ(550, constraints.layoutSize.height());
2457 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f); 2457 EXPECT_NEAR(2.0f, constraints.initialScale, 0.01f);
2458 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f); 2458 EXPECT_NEAR(2.0f, constraints.minimumScale, 0.01f);
2459 EXPECT_NEAR(2.0f, constraints.maximumScale, 0.01f); 2459 EXPECT_NEAR(2.0f, constraints.maximumScale, 0.01f);
2460 EXPECT_FALSE(page->viewportDescription().userZoom); 2460 EXPECT_FALSE(page->viewportDescription().userZoom);
2461 } 2461 }
2462 2462
2463 TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWithoutContent) 2463 TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWithoutContent)
2464 { 2464 {
2465 registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized.html"); 2465 registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized.html");
2466 2466
2467 FrameTestHelpers::WebViewHelper webViewHelper; 2467 FrameTestHelpers::WebViewHelper webViewHelper;
2468 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-mobile optimized.html", true, 0, 0, setViewportSettings); 2468 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-mobile optimized.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2469 2469
2470 Page* page = webViewHelper.webViewImpl()->page(); 2470 Page* page = webViewHelper.webViewImpl()->page();
2471 2471
2472 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2472 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2473 2473
2474 EXPECT_EQ(320, constraints.layoutSize.width()); 2474 EXPECT_EQ(320, constraints.layoutSize.width());
2475 EXPECT_EQ(352, constraints.layoutSize.height()); 2475 EXPECT_EQ(352, constraints.layoutSize.height());
2476 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2476 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2477 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2477 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2478 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2478 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2479 EXPECT_TRUE(page->viewportDescription().userZoom); 2479 EXPECT_TRUE(page->viewportDescription().userZoom);
2480 } 2480 }
2481 2481
2482 TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith0) 2482 TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith0)
2483 { 2483 {
2484 registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized-2.html") ; 2484 registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized-2.html") ;
2485 2485
2486 FrameTestHelpers::WebViewHelper webViewHelper; 2486 FrameTestHelpers::WebViewHelper webViewHelper;
2487 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-mobile optimized-2.html", true, 0, 0, setViewportSettings); 2487 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-mobile optimized-2.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2488 2488
2489 Page* page = webViewHelper.webViewImpl()->page(); 2489 Page* page = webViewHelper.webViewImpl()->page();
2490 2490
2491 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2491 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2492 2492
2493 EXPECT_EQ(320, constraints.layoutSize.width()); 2493 EXPECT_EQ(320, constraints.layoutSize.width());
2494 EXPECT_EQ(352, constraints.layoutSize.height()); 2494 EXPECT_EQ(352, constraints.layoutSize.height());
2495 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2495 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2496 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2496 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2497 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2497 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2498 EXPECT_TRUE(page->viewportDescription().userZoom); 2498 EXPECT_TRUE(page->viewportDescription().userZoom);
2499 } 2499 }
2500 2500
2501 TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith400) 2501 TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith400)
2502 { 2502 {
2503 registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized-2.html") ; 2503 registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized-2.html") ;
2504 2504
2505 FrameTestHelpers::WebViewHelper webViewHelper; 2505 FrameTestHelpers::WebViewHelper webViewHelper;
2506 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-mobile optimized-2.html", true, 0, 0, setViewportSettings); 2506 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-mobile optimized-2.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2507 2507
2508 Page* page = webViewHelper.webViewImpl()->page(); 2508 Page* page = webViewHelper.webViewImpl()->page();
2509 2509
2510 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2510 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2511 2511
2512 EXPECT_EQ(320, constraints.layoutSize.width()); 2512 EXPECT_EQ(320, constraints.layoutSize.width());
2513 EXPECT_EQ(352, constraints.layoutSize.height()); 2513 EXPECT_EQ(352, constraints.layoutSize.height());
2514 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2514 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2515 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2515 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2516 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2516 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2517 EXPECT_TRUE(page->viewportDescription().userZoom); 2517 EXPECT_TRUE(page->viewportDescription().userZoom);
2518 } 2518 }
2519 2519
2520 TEST_F(ViewportTest, viewportLegacyOrdering2) 2520 TEST_F(ViewportTest, viewportLegacyOrdering2)
2521 { 2521 {
2522 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-2.html"); 2522 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-2.html");
2523 2523
2524 FrameTestHelpers::WebViewHelper webViewHelper; 2524 FrameTestHelpers::WebViewHelper webViewHelper;
2525 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-2.html", true, 0, 0, setViewportSettings); 2525 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-2.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2526 2526
2527 Page* page = webViewHelper.webViewImpl()->page(); 2527 Page* page = webViewHelper.webViewImpl()->page();
2528 2528
2529 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2529 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2530 2530
2531 EXPECT_EQ(300, constraints.layoutSize.width()); 2531 EXPECT_EQ(300, constraints.layoutSize.width());
2532 EXPECT_EQ(330, constraints.layoutSize.height()); 2532 EXPECT_EQ(330, constraints.layoutSize.height());
2533 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f); 2533 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f);
2534 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f); 2534 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f);
2535 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2535 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2536 EXPECT_TRUE(page->viewportDescription().userZoom); 2536 EXPECT_TRUE(page->viewportDescription().userZoom);
2537 } 2537 }
2538 2538
2539 TEST_F(ViewportTest, viewportLegacyOrdering3) 2539 TEST_F(ViewportTest, viewportLegacyOrdering3)
2540 { 2540 {
2541 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-3.html"); 2541 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-3.html");
2542 2542
2543 FrameTestHelpers::WebViewHelper webViewHelper; 2543 FrameTestHelpers::WebViewHelper webViewHelper;
2544 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-3.html", true, 0, 0, setViewportSettings); 2544 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-3.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2545 2545
2546 Page* page = webViewHelper.webViewImpl()->page(); 2546 Page* page = webViewHelper.webViewImpl()->page();
2547 2547
2548 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2548 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2549 2549
2550 EXPECT_EQ(300, constraints.layoutSize.width()); 2550 EXPECT_EQ(300, constraints.layoutSize.width());
2551 EXPECT_EQ(330, constraints.layoutSize.height()); 2551 EXPECT_EQ(330, constraints.layoutSize.height());
2552 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f); 2552 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f);
2553 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f); 2553 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f);
2554 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2554 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2555 EXPECT_TRUE(page->viewportDescription().userZoom); 2555 EXPECT_TRUE(page->viewportDescription().userZoom);
2556 } 2556 }
2557 2557
2558 TEST_F(ViewportTest, viewportLegacyOrdering4) 2558 TEST_F(ViewportTest, viewportLegacyOrdering4)
2559 { 2559 {
2560 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-4.html"); 2560 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-4.html");
2561 2561
2562 FrameTestHelpers::WebViewHelper webViewHelper; 2562 FrameTestHelpers::WebViewHelper webViewHelper;
2563 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-4.html", true, 0, 0, setViewportSettings); 2563 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-4.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2564 2564
2565 Page* page = webViewHelper.webViewImpl()->page(); 2565 Page* page = webViewHelper.webViewImpl()->page();
2566 2566
2567 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2567 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2568 2568
2569 EXPECT_EQ(300, constraints.layoutSize.width()); 2569 EXPECT_EQ(300, constraints.layoutSize.width());
2570 EXPECT_EQ(330, constraints.layoutSize.height()); 2570 EXPECT_EQ(330, constraints.layoutSize.height());
2571 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f); 2571 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f);
2572 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f); 2572 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f);
2573 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2573 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2574 EXPECT_TRUE(page->viewportDescription().userZoom); 2574 EXPECT_TRUE(page->viewportDescription().userZoom);
2575 } 2575 }
2576 2576
2577 TEST_F(ViewportTest, viewportLegacyOrdering5) 2577 TEST_F(ViewportTest, viewportLegacyOrdering5)
2578 { 2578 {
2579 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-5.html"); 2579 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-5.html");
2580 2580
2581 FrameTestHelpers::WebViewHelper webViewHelper; 2581 FrameTestHelpers::WebViewHelper webViewHelper;
2582 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-5.html", true, 0, 0, setViewportSettings); 2582 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-5.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2583 2583
2584 Page* page = webViewHelper.webViewImpl()->page(); 2584 Page* page = webViewHelper.webViewImpl()->page();
2585 2585
2586 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2586 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2587 2587
2588 EXPECT_EQ(320, constraints.layoutSize.width()); 2588 EXPECT_EQ(320, constraints.layoutSize.width());
2589 EXPECT_EQ(352, constraints.layoutSize.height()); 2589 EXPECT_EQ(352, constraints.layoutSize.height());
2590 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2590 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2591 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2591 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2592 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2592 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2593 EXPECT_TRUE(page->viewportDescription().userZoom); 2593 EXPECT_TRUE(page->viewportDescription().userZoom);
2594 } 2594 }
2595 2595
2596 TEST_F(ViewportTest, viewportLegacyOrdering6) 2596 TEST_F(ViewportTest, viewportLegacyOrdering6)
2597 { 2597 {
2598 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-6.html"); 2598 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-6.html");
2599 2599
2600 FrameTestHelpers::WebViewHelper webViewHelper; 2600 FrameTestHelpers::WebViewHelper webViewHelper;
2601 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-6.html", true, 0, 0, setViewportSettings); 2601 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-6.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2602 2602
2603 Page* page = webViewHelper.webViewImpl()->page(); 2603 Page* page = webViewHelper.webViewImpl()->page();
2604 2604
2605 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2605 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2606 2606
2607 EXPECT_EQ(320, constraints.layoutSize.width()); 2607 EXPECT_EQ(320, constraints.layoutSize.width());
2608 EXPECT_EQ(352, constraints.layoutSize.height()); 2608 EXPECT_EQ(352, constraints.layoutSize.height());
2609 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2609 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2610 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2610 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2611 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2611 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2612 EXPECT_TRUE(page->viewportDescription().userZoom); 2612 EXPECT_TRUE(page->viewportDescription().userZoom);
2613 } 2613 }
2614 2614
2615 TEST_F(ViewportTest, viewportLegacyOrdering7) 2615 TEST_F(ViewportTest, viewportLegacyOrdering7)
2616 { 2616 {
2617 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-7.html"); 2617 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-7.html");
2618 2618
2619 FrameTestHelpers::WebViewHelper webViewHelper; 2619 FrameTestHelpers::WebViewHelper webViewHelper;
2620 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-7.html", true, 0, 0, setViewportSettings); 2620 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-7.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2621 2621
2622 Page* page = webViewHelper.webViewImpl()->page(); 2622 Page* page = webViewHelper.webViewImpl()->page();
2623 2623
2624 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2624 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2625 2625
2626 EXPECT_EQ(300, constraints.layoutSize.width()); 2626 EXPECT_EQ(300, constraints.layoutSize.width());
2627 EXPECT_EQ(330, constraints.layoutSize.height()); 2627 EXPECT_EQ(330, constraints.layoutSize.height());
2628 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f); 2628 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f);
2629 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f); 2629 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f);
2630 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2630 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2631 EXPECT_TRUE(page->viewportDescription().userZoom); 2631 EXPECT_TRUE(page->viewportDescription().userZoom);
2632 } 2632 }
2633 2633
2634 TEST_F(ViewportTest, viewportLegacyOrdering8) 2634 TEST_F(ViewportTest, viewportLegacyOrdering8)
2635 { 2635 {
2636 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-8.html"); 2636 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-8.html");
2637 2637
2638 FrameTestHelpers::WebViewHelper webViewHelper; 2638 FrameTestHelpers::WebViewHelper webViewHelper;
2639 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-8.html", true, 0, 0, setViewportSettings); 2639 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-8.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2640 2640
2641 Page* page = webViewHelper.webViewImpl()->page(); 2641 Page* page = webViewHelper.webViewImpl()->page();
2642 2642
2643 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2643 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2644 2644
2645 EXPECT_EQ(300, constraints.layoutSize.width()); 2645 EXPECT_EQ(300, constraints.layoutSize.width());
2646 EXPECT_EQ(330, constraints.layoutSize.height()); 2646 EXPECT_EQ(330, constraints.layoutSize.height());
2647 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f); 2647 EXPECT_NEAR(1.07f, constraints.initialScale, 0.01f);
2648 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f); 2648 EXPECT_NEAR(1.07f, constraints.minimumScale, 0.01f);
2649 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2649 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2650 EXPECT_TRUE(page->viewportDescription().userZoom); 2650 EXPECT_TRUE(page->viewportDescription().userZoom);
2651 } 2651 }
2652 2652
2653 TEST_F(ViewportTest, viewportLegacyEmptyAtViewportDoesntOverrideViewportMeta) 2653 TEST_F(ViewportTest, viewportLegacyEmptyAtViewportDoesntOverrideViewportMeta)
2654 { 2654 {
2655 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-10.html"); 2655 registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-10.html");
2656 2656
2657 FrameTestHelpers::WebViewHelper webViewHelper; 2657 FrameTestHelpers::WebViewHelper webViewHelper;
2658 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-10.html", true, 0, 0, setViewportSettings); 2658 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-orderi ng-10.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2659 2659
2660 Page* page = webViewHelper.webViewImpl()->page(); 2660 Page* page = webViewHelper.webViewImpl()->page();
2661 PageScaleConstraints constraints = runViewportTest(page, 800, 600); 2661 PageScaleConstraints constraints = runViewportTest(page, 800, 600);
2662 2662
2663 EXPECT_EQ(5000, constraints.layoutSize.width()); 2663 EXPECT_EQ(5000, constraints.layoutSize.width());
2664 } 2664 }
2665 2665
2666 TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMP) 2666 TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMP)
2667 { 2667 {
2668 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html"); 2668 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html");
2669 2669
2670 FrameTestHelpers::WebViewHelper webViewHelper; 2670 FrameTestHelpers::WebViewHelper webViewHelper;
2671 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p.html", true, 0, 0, setViewportSettings); 2671 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2672 2672
2673 Page* page = webViewHelper.webViewImpl()->page(); 2673 Page* page = webViewHelper.webViewImpl()->page();
2674 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2674 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2675 2675
2676 EXPECT_EQ(320, constraints.layoutSize.width()); 2676 EXPECT_EQ(320, constraints.layoutSize.width());
2677 EXPECT_EQ(352, constraints.layoutSize.height()); 2677 EXPECT_EQ(352, constraints.layoutSize.height());
2678 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2678 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2679 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2679 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2680 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2680 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2681 EXPECT_TRUE(page->viewportDescription().userZoom); 2681 EXPECT_TRUE(page->viewportDescription().userZoom);
2682 } 2682 }
2683 2683
2684 TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMPAndOverriddenByMe ta) 2684 TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMPAndOverriddenByMe ta)
2685 { 2685 {
2686 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-misplaced-doctyp e.html"); 2686 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-misplaced-doctyp e.html");
2687 2687
2688 FrameTestHelpers::WebViewHelper webViewHelper; 2688 FrameTestHelpers::WebViewHelper webViewHelper;
2689 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p-misplaced-doctype.html", true, 0, 0, setViewportSettings); 2689 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p-misplaced-doctype.html", true, nullptr, nullptr, nullptr, setViewportSettings) ;
2690 2690
2691 Page* page = webViewHelper.webViewImpl()->page(); 2691 Page* page = webViewHelper.webViewImpl()->page();
2692 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2692 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2693 2693
2694 EXPECT_EQ(640, constraints.layoutSize.width()); 2694 EXPECT_EQ(640, constraints.layoutSize.width());
2695 EXPECT_EQ(704, constraints.layoutSize.height()); 2695 EXPECT_EQ(704, constraints.layoutSize.height());
2696 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 2696 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
2697 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f); 2697 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f);
2698 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2698 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2699 EXPECT_TRUE(page->viewportDescription().userZoom); 2699 EXPECT_TRUE(page->viewportDescription().userZoom);
2700 } 2700 }
2701 2701
2702 TEST_F(ViewportTest, viewportLegacyXHTMLMPOrdering) 2702 TEST_F(ViewportTest, viewportLegacyXHTMLMPOrdering)
2703 { 2703 {
2704 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-ordering.html"); 2704 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-ordering.html");
2705 2705
2706 FrameTestHelpers::WebViewHelper webViewHelper; 2706 FrameTestHelpers::WebViewHelper webViewHelper;
2707 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p-ordering.html", true, 0, 0, setViewportSettings); 2707 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p-ordering.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2708 2708
2709 Page* page = webViewHelper.webViewImpl()->page(); 2709 Page* page = webViewHelper.webViewImpl()->page();
2710 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2710 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2711 2711
2712 EXPECT_EQ(640, constraints.layoutSize.width()); 2712 EXPECT_EQ(640, constraints.layoutSize.width());
2713 EXPECT_EQ(704, constraints.layoutSize.height()); 2713 EXPECT_EQ(704, constraints.layoutSize.height());
2714 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f); 2714 EXPECT_NEAR(0.5f, constraints.initialScale, 0.01f);
2715 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f); 2715 EXPECT_NEAR(0.5f, constraints.minimumScale, 0.01f);
2716 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2716 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2717 EXPECT_TRUE(page->viewportDescription().userZoom); 2717 EXPECT_TRUE(page->viewportDescription().userZoom);
2718 } 2718 }
2719 2719
2720 TEST_F(ViewportTest, viewportLegacyXHTMLMPRemoveAndAdd) 2720 TEST_F(ViewportTest, viewportLegacyXHTMLMPRemoveAndAdd)
2721 { 2721 {
2722 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html"); 2722 registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html");
2723 2723
2724 FrameTestHelpers::WebViewHelper webViewHelper; 2724 FrameTestHelpers::WebViewHelper webViewHelper;
2725 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p.html", true, 0, 0, setViewportSettings); 2725 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlm p.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2726 2726
2727 Page* page = webViewHelper.webViewImpl()->page(); 2727 Page* page = webViewHelper.webViewImpl()->page();
2728 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2728 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2729 2729
2730 EXPECT_EQ(320, constraints.layoutSize.width()); 2730 EXPECT_EQ(320, constraints.layoutSize.width());
2731 EXPECT_EQ(352, constraints.layoutSize.height()); 2731 EXPECT_EQ(352, constraints.layoutSize.height());
2732 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2732 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2733 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2733 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2734 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2734 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2735 EXPECT_TRUE(page->viewportDescription().userZoom); 2735 EXPECT_TRUE(page->viewportDescription().userZoom);
(...skipping 22 matching lines...) Expand all
2758 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2758 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2759 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2759 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2760 EXPECT_TRUE(page->viewportDescription().userZoom); 2760 EXPECT_TRUE(page->viewportDescription().userZoom);
2761 } 2761 }
2762 2762
2763 TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScale) 2763 TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScale)
2764 { 2764 {
2765 registerMockedHttpURLLoad("viewport/viewport-limits-adjusted-for-no-user-sca le.html"); 2765 registerMockedHttpURLLoad("viewport/viewport-limits-adjusted-for-no-user-sca le.html");
2766 2766
2767 FrameTestHelpers::WebViewHelper webViewHelper; 2767 FrameTestHelpers::WebViewHelper webViewHelper;
2768 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-limits-adjust ed-for-no-user-scale.html", true, 0, 0, setViewportSettings); 2768 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-limits-adjust ed-for-no-user-scale.html", true, nullptr, nullptr, nullptr, setViewportSettings );
2769 2769
2770 Page* page = webViewHelper.webViewImpl()->page(); 2770 Page* page = webViewHelper.webViewImpl()->page();
2771 2771
2772 EXPECT_FALSE(page->viewportDescription().userZoom); 2772 EXPECT_FALSE(page->viewportDescription().userZoom);
2773 } 2773 }
2774 2774
2775 TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScaleControl) 2775 TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScaleControl)
2776 { 2776 {
2777 registerMockedHttpURLLoad("viewport/viewport-limits-adjusted-for-no-user-sca le-control.html"); 2777 registerMockedHttpURLLoad("viewport/viewport-limits-adjusted-for-no-user-sca le-control.html");
2778 2778
2779 FrameTestHelpers::WebViewHelper webViewHelper; 2779 FrameTestHelpers::WebViewHelper webViewHelper;
2780 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-limits-adjust ed-for-no-user-scale-control.html", true, 0, 0, setViewportSettings); 2780 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-limits-adjust ed-for-no-user-scale-control.html", true, nullptr, nullptr, nullptr, setViewport Settings);
2781 2781
2782 Page* page = webViewHelper.webViewImpl()->page(); 2782 Page* page = webViewHelper.webViewImpl()->page();
2783 2783
2784 EXPECT_TRUE(page->viewportDescription().userZoom); 2784 EXPECT_TRUE(page->viewportDescription().userZoom);
2785 } 2785 }
2786 2786
2787 TEST_F(ViewportTest, viewportTriggersGpuRasterization) 2787 TEST_F(ViewportTest, viewportTriggersGpuRasterization)
2788 { 2788 {
2789 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization.html"); 2789 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization.html");
2790 FrameTestHelpers::WebViewHelper webViewHelper; 2790 FrameTestHelpers::WebViewHelper webViewHelper;
2791 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion.html", true, 0, 0, setViewportSettings); 2791 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion.html", true, nullptr, nullptr, nullptr, setViewportSettings);
2792 webViewHelper.webView()->resize(WebSize(640, 480)); 2792 webViewHelper.webView()->resize(WebSize(640, 480));
2793 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting()); 2793 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting());
2794 2794
2795 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-expanded-heur istics.html"); 2795 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-expanded-heur istics.html");
2796 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-expanded-heuristics.html", true, 0, 0, setViewportSettings); 2796 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-expanded-heuristics.html", true, nullptr, nullptr, nullptr, setViewportSett ings);
2797 webViewHelper.webView()->resize(WebSize(640, 480)); 2797 webViewHelper.webView()->resize(WebSize(640, 480));
2798 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting()); 2798 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting());
2799 2799
2800 registerMockedHttpURLLoad("viewport/viewport-inferred-values-do-not-trigger- gpu-rasterization.html"); 2800 registerMockedHttpURLLoad("viewport/viewport-inferred-values-do-not-trigger- gpu-rasterization.html");
2801 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-inferred-valu es-do-not-trigger-gpu-rasterization.html", true, 0, 0, setViewportSettings); 2801 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-inferred-valu es-do-not-trigger-gpu-rasterization.html", true, nullptr, nullptr, nullptr, setV iewportSettings);
2802 webViewHelper.webView()->resize(WebSize(640, 480)); 2802 webViewHelper.webView()->resize(WebSize(640, 480));
2803 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting()); 2803 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2804 2804
2805 registerMockedHttpURLLoad("viewport/viewport-1.html"); 2805 registerMockedHttpURLLoad("viewport/viewport-1.html");
2806 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true , 0, 0, setViewportSettings); 2806 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true , nullptr, nullptr, nullptr, setViewportSettings);
2807 webViewHelper.webView()->resize(WebSize(640, 480)); 2807 webViewHelper.webView()->resize(WebSize(640, 480));
2808 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting()); 2808 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2809 2809
2810 registerMockedHttpURLLoad("viewport/viewport-15.html"); 2810 registerMockedHttpURLLoad("viewport/viewport-15.html");
2811 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-15.html", tru e, 0, 0, setViewportSettings); 2811 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-15.html", tru e, nullptr, nullptr, nullptr, setViewportSettings);
2812 webViewHelper.webView()->resize(WebSize(640, 480)); 2812 webViewHelper.webView()->resize(WebSize(640, 480));
2813 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting()); 2813 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2814 2814
2815 registerMockedHttpURLLoad("viewport/viewport-130.html"); 2815 registerMockedHttpURLLoad("viewport/viewport-130.html");
2816 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-130.html", tr ue, 0, 0, setViewportSettings); 2816 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-130.html", tr ue, nullptr, nullptr, nullptr, setViewportSettings);
2817 webViewHelper.webView()->resize(WebSize(640, 480)); 2817 webViewHelper.webView()->resize(WebSize(640, 480));
2818 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting()); 2818 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2819 } 2819 }
2820 2820
2821 class ConsoleMessageWebFrameClient : public FrameTestHelpers::TestWebFrameClient { 2821 class ConsoleMessageWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
2822 public: 2822 public:
2823 virtual void didAddMessageToConsole(const WebConsoleMessage& msg, const WebS tring& sourceName, unsigned sourceLine, const WebString& stackTrace) 2823 virtual void didAddMessageToConsole(const WebConsoleMessage& msg, const WebS tring& sourceName, unsigned sourceLine, const WebString& stackTrace)
2824 { 2824 {
2825 messages.append(msg); 2825 messages.append(msg);
2826 } 2826 }
2827 2827
2828 Vector<WebConsoleMessage> messages; 2828 Vector<WebConsoleMessage> messages;
2829 }; 2829 };
2830 2830
2831 TEST_F(ViewportTest, viewportWarnings1) 2831 TEST_F(ViewportTest, viewportWarnings1)
2832 { 2832 {
2833 ConsoleMessageWebFrameClient webFrameClient; 2833 ConsoleMessageWebFrameClient webFrameClient;
2834 2834
2835 registerMockedHttpURLLoad("viewport/viewport-warnings-1.html"); 2835 registerMockedHttpURLLoad("viewport/viewport-warnings-1.html");
2836 2836
2837 FrameTestHelpers::WebViewHelper webViewHelper; 2837 FrameTestHelpers::WebViewHelper webViewHelper;
2838 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-1.ht ml", true, &webFrameClient, 0, setViewportSettings); 2838 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-1.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
2839 2839
2840 Page* page = webViewHelper.webViewImpl()->page(); 2840 Page* page = webViewHelper.webViewImpl()->page();
2841 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2841 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2842 2842
2843 EXPECT_TRUE(webFrameClient.messages.isEmpty()); 2843 EXPECT_TRUE(webFrameClient.messages.isEmpty());
2844 2844
2845 EXPECT_EQ(320, constraints.layoutSize.width()); 2845 EXPECT_EQ(320, constraints.layoutSize.width());
2846 EXPECT_EQ(352, constraints.layoutSize.height()); 2846 EXPECT_EQ(352, constraints.layoutSize.height());
2847 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); 2847 EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
2848 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); 2848 EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
2849 EXPECT_NEAR(2.0f, constraints.maximumScale, 0.01f); 2849 EXPECT_NEAR(2.0f, constraints.maximumScale, 0.01f);
2850 EXPECT_TRUE(page->viewportDescription().userZoom); 2850 EXPECT_TRUE(page->viewportDescription().userZoom);
2851 } 2851 }
2852 2852
2853 TEST_F(ViewportTest, viewportWarnings2) 2853 TEST_F(ViewportTest, viewportWarnings2)
2854 { 2854 {
2855 ConsoleMessageWebFrameClient webFrameClient; 2855 ConsoleMessageWebFrameClient webFrameClient;
2856 2856
2857 registerMockedHttpURLLoad("viewport/viewport-warnings-2.html"); 2857 registerMockedHttpURLLoad("viewport/viewport-warnings-2.html");
2858 2858
2859 FrameTestHelpers::WebViewHelper webViewHelper; 2859 FrameTestHelpers::WebViewHelper webViewHelper;
2860 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-2.ht ml", true, &webFrameClient, 0, setViewportSettings); 2860 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-2.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
2861 2861
2862 Page* page = webViewHelper.webViewImpl()->page(); 2862 Page* page = webViewHelper.webViewImpl()->page();
2863 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2863 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2864 2864
2865 EXPECT_EQ(1U, webFrameClient.messages.size()); 2865 EXPECT_EQ(1U, webFrameClient.messages.size());
2866 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ; 2866 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ;
2867 EXPECT_STREQ("The key \"wwidth\" is not recognized and ignored.", webFrameCl ient.messages[0].text.utf8().c_str()); 2867 EXPECT_STREQ("The key \"wwidth\" is not recognized and ignored.", webFrameCl ient.messages[0].text.utf8().c_str());
2868 2868
2869 EXPECT_EQ(980, constraints.layoutSize.width()); 2869 EXPECT_EQ(980, constraints.layoutSize.width());
2870 EXPECT_EQ(1078, constraints.layoutSize.height()); 2870 EXPECT_EQ(1078, constraints.layoutSize.height());
2871 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); 2871 EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f);
2872 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); 2872 EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f);
2873 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2873 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2874 EXPECT_TRUE(page->viewportDescription().userZoom); 2874 EXPECT_TRUE(page->viewportDescription().userZoom);
2875 } 2875 }
2876 2876
2877 TEST_F(ViewportTest, viewportWarnings3) 2877 TEST_F(ViewportTest, viewportWarnings3)
2878 { 2878 {
2879 ConsoleMessageWebFrameClient webFrameClient; 2879 ConsoleMessageWebFrameClient webFrameClient;
2880 2880
2881 registerMockedHttpURLLoad("viewport/viewport-warnings-3.html"); 2881 registerMockedHttpURLLoad("viewport/viewport-warnings-3.html");
2882 2882
2883 FrameTestHelpers::WebViewHelper webViewHelper; 2883 FrameTestHelpers::WebViewHelper webViewHelper;
2884 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-3.ht ml", true, &webFrameClient, 0, setViewportSettings); 2884 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-3.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
2885 2885
2886 Page* page = webViewHelper.webViewImpl()->page(); 2886 Page* page = webViewHelper.webViewImpl()->page();
2887 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2887 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2888 2888
2889 EXPECT_EQ(1U, webFrameClient.messages.size()); 2889 EXPECT_EQ(1U, webFrameClient.messages.size());
2890 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ; 2890 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ;
2891 EXPECT_STREQ("The value \"unrecognized-width\" for key \"width\" is invalid, and has been ignored.", 2891 EXPECT_STREQ("The value \"unrecognized-width\" for key \"width\" is invalid, and has been ignored.",
2892 webFrameClient.messages[0].text.utf8().c_str()); 2892 webFrameClient.messages[0].text.utf8().c_str());
2893 2893
2894 EXPECT_NEAR(64.0f, constraints.layoutSize.width(), 0.01); 2894 EXPECT_NEAR(64.0f, constraints.layoutSize.width(), 0.01);
2895 EXPECT_NEAR(70.4f, constraints.layoutSize.height(), 0.01); 2895 EXPECT_NEAR(70.4f, constraints.layoutSize.height(), 0.01);
2896 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2896 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2897 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2897 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2898 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2898 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2899 EXPECT_TRUE(page->viewportDescription().userZoom); 2899 EXPECT_TRUE(page->viewportDescription().userZoom);
2900 } 2900 }
2901 2901
2902 TEST_F(ViewportTest, viewportWarnings4) 2902 TEST_F(ViewportTest, viewportWarnings4)
2903 { 2903 {
2904 ConsoleMessageWebFrameClient webFrameClient; 2904 ConsoleMessageWebFrameClient webFrameClient;
2905 2905
2906 registerMockedHttpURLLoad("viewport/viewport-warnings-4.html"); 2906 registerMockedHttpURLLoad("viewport/viewport-warnings-4.html");
2907 2907
2908 FrameTestHelpers::WebViewHelper webViewHelper; 2908 FrameTestHelpers::WebViewHelper webViewHelper;
2909 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-4.ht ml", true, &webFrameClient, 0, setViewportSettings); 2909 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-4.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
2910 2910
2911 Page* page = webViewHelper.webViewImpl()->page(); 2911 Page* page = webViewHelper.webViewImpl()->page();
2912 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2912 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2913 2913
2914 EXPECT_EQ(1U, webFrameClient.messages.size()); 2914 EXPECT_EQ(1U, webFrameClient.messages.size());
2915 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ; 2915 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ;
2916 EXPECT_STREQ("The value \"123x456\" for key \"width\" was truncated to its n umeric prefix.", 2916 EXPECT_STREQ("The value \"123x456\" for key \"width\" was truncated to its n umeric prefix.",
2917 webFrameClient.messages[0].text.utf8().c_str()); 2917 webFrameClient.messages[0].text.utf8().c_str());
2918 2918
2919 EXPECT_NEAR(123.0f, constraints.layoutSize.width(), 0.01); 2919 EXPECT_NEAR(123.0f, constraints.layoutSize.width(), 0.01);
2920 EXPECT_NEAR(135.3f, constraints.layoutSize.height(), 0.01); 2920 EXPECT_NEAR(135.3f, constraints.layoutSize.height(), 0.01);
2921 EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f); 2921 EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f);
2922 EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f); 2922 EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f);
2923 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2923 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2924 EXPECT_TRUE(page->viewportDescription().userZoom); 2924 EXPECT_TRUE(page->viewportDescription().userZoom);
2925 } 2925 }
2926 2926
2927 TEST_F(ViewportTest, viewportWarnings5) 2927 TEST_F(ViewportTest, viewportWarnings5)
2928 { 2928 {
2929 ConsoleMessageWebFrameClient webFrameClient; 2929 ConsoleMessageWebFrameClient webFrameClient;
2930 2930
2931 registerMockedHttpURLLoad("viewport/viewport-warnings-5.html"); 2931 registerMockedHttpURLLoad("viewport/viewport-warnings-5.html");
2932 2932
2933 FrameTestHelpers::WebViewHelper webViewHelper; 2933 FrameTestHelpers::WebViewHelper webViewHelper;
2934 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-5.ht ml", true, &webFrameClient, 0, setViewportSettings); 2934 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-5.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
2935 2935
2936 Page* page = webViewHelper.webViewImpl()->page(); 2936 Page* page = webViewHelper.webViewImpl()->page();
2937 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2937 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2938 2938
2939 EXPECT_EQ(5U, webFrameClient.messages.size()); 2939 EXPECT_EQ(5U, webFrameClient.messages.size());
2940 2940
2941 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ; 2941 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ;
2942 EXPECT_STREQ("The value \"device-width;\" for key \"width\" is invalid, and has been ignored.", 2942 EXPECT_STREQ("The value \"device-width;\" for key \"width\" is invalid, and has been ignored.",
2943 webFrameClient.messages[0].text.utf8().c_str()); 2943 webFrameClient.messages[0].text.utf8().c_str());
2944 2944
(...skipping 21 matching lines...) Expand all
2966 EXPECT_FALSE(page->viewportDescription().userZoom); 2966 EXPECT_FALSE(page->viewportDescription().userZoom);
2967 } 2967 }
2968 2968
2969 TEST_F(ViewportTest, viewportWarnings6) 2969 TEST_F(ViewportTest, viewportWarnings6)
2970 { 2970 {
2971 ConsoleMessageWebFrameClient webFrameClient; 2971 ConsoleMessageWebFrameClient webFrameClient;
2972 2972
2973 registerMockedHttpURLLoad("viewport/viewport-warnings-6.html"); 2973 registerMockedHttpURLLoad("viewport/viewport-warnings-6.html");
2974 2974
2975 FrameTestHelpers::WebViewHelper webViewHelper; 2975 FrameTestHelpers::WebViewHelper webViewHelper;
2976 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-6.ht ml", true, &webFrameClient, 0, setViewportSettings); 2976 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-6.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
2977 2977
2978 Page* page = webViewHelper.webViewImpl()->page(); 2978 Page* page = webViewHelper.webViewImpl()->page();
2979 PageScaleConstraints constraints = runViewportTest(page, 320, 352); 2979 PageScaleConstraints constraints = runViewportTest(page, 320, 352);
2980 2980
2981 EXPECT_EQ(1U, webFrameClient.messages.size()); 2981 EXPECT_EQ(1U, webFrameClient.messages.size());
2982 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ; 2982 EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level) ;
2983 EXPECT_STREQ("The value \"\" for key \"width\" is invalid, and has been igno red.", 2983 EXPECT_STREQ("The value \"\" for key \"width\" is invalid, and has been igno red.",
2984 webFrameClient.messages[0].text.utf8().c_str()); 2984 webFrameClient.messages[0].text.utf8().c_str());
2985 2985
2986 EXPECT_NEAR(64.0f, constraints.layoutSize.width(), 0.01); 2986 EXPECT_NEAR(64.0f, constraints.layoutSize.width(), 0.01);
2987 EXPECT_NEAR(70.4f, constraints.layoutSize.height(), 0.01); 2987 EXPECT_NEAR(70.4f, constraints.layoutSize.height(), 0.01);
2988 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); 2988 EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f);
2989 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); 2989 EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f);
2990 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); 2990 EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
2991 EXPECT_TRUE(page->viewportDescription().userZoom); 2991 EXPECT_TRUE(page->viewportDescription().userZoom);
2992 } 2992 }
2993 2993
2994 TEST_F(ViewportTest, viewportWarnings7) 2994 TEST_F(ViewportTest, viewportWarnings7)
2995 { 2995 {
2996 ConsoleMessageWebFrameClient webFrameClient; 2996 ConsoleMessageWebFrameClient webFrameClient;
2997 2997
2998 registerMockedHttpURLLoad("viewport/viewport-warnings-7.html"); 2998 registerMockedHttpURLLoad("viewport/viewport-warnings-7.html");
2999 2999
3000 FrameTestHelpers::WebViewHelper webViewHelper; 3000 FrameTestHelpers::WebViewHelper webViewHelper;
3001 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-7.ht ml", true, &webFrameClient, 0, setViewportSettings); 3001 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-7.ht ml", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
3002 3002
3003 Page* page = webViewHelper.webViewImpl()->page(); 3003 Page* page = webViewHelper.webViewImpl()->page();
3004 runViewportTest(page, 320, 352); 3004 runViewportTest(page, 320, 352);
3005 3005
3006 EXPECT_EQ(0U, webFrameClient.messages.size()); 3006 EXPECT_EQ(0U, webFrameClient.messages.size());
3007 } 3007 }
3008 3008
3009 } // namespace blink 3009 } // namespace blink
OLDNEW
« third_party/WebKit/Source/web/ChromeClientImpl.cpp ('K') | « third_party/WebKit/Source/web/tests/TopControlsTest.cpp ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698