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

Side by Side Diff: Source/web/tests/WebFrameTest.cpp

Issue 55073002: [Android WebView] Add a quirk to clobber initial scale in certain cases (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed checking against device-width Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | Source/web/tests/data/viewport-initial-scale-1.html » ('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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 1221
1222 FrameTestHelpers::WebViewHelper webViewHelper; 1222 FrameTestHelpers::WebViewHelper webViewHelper;
1223 webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale. html", true, 0, &client); 1223 webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale. html", true, 0, &client);
1224 webViewHelper.webView()->settings()->setViewportEnabled(true); 1224 webViewHelper.webView()->settings()->setViewportEnabled(true);
1225 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor ); 1225 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor );
1226 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); 1226 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1227 1227
1228 EXPECT_EQ(enforcedPageScaleFactor, webViewHelper.webView()->pageScaleFactor( )); 1228 EXPECT_EQ(enforcedPageScaleFactor, webViewHelper.webView()->pageScaleFactor( ));
1229 } 1229 }
1230 1230
1231 TEST_F(WebFrameTest, SmallPermanentInitialPageScaleFactorIsClobberedWithDeviceWi dth)
1232 {
1233 UseMockScrollbarSettings mockScrollbarSettings;
1234 registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html");
1235
1236 FixedLayoutTestWebViewClient client;
1237 client.m_screenInfo.deviceScaleFactor = 1;
1238 int viewportWidth = 640;
1239 int viewportHeight = 480;
1240 float enforcedPageScalePactor = 0.75f;
1241 float pageScaleFactor = 0.5f;
1242
1243 {
1244 FrameTestHelpers::WebViewHelper webViewHelper;
1245 webViewHelper.initializeAndLoad(m_baseURL + "viewport-device-0.5x-initia l-scale.html", true, 0, &client);
1246 webViewHelper.webView()->settings()->setViewportEnabled(true);
1247 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(false);
1248 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1249 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1250
1251 EXPECT_EQ(enforcedPageScalePactor, webViewHelper.webView()->pageScaleFac tor());
1252 }
1253
1254 {
1255 FrameTestHelpers::WebViewHelper webViewHelper;
1256 webViewHelper.initializeAndLoad(m_baseURL + "viewport-device-0.5x-initia l-scale.html", true, 0, &client);
1257 webViewHelper.webView()->settings()->setViewportEnabled(true);
1258 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(true);
1259 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1260 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1261
1262 EXPECT_EQ(pageScaleFactor, webViewHelper.webView()->pageScaleFactor());
1263 }
1264 }
1265
1266 TEST_F(WebFrameTest, SmallPermanentInitialPageScaleFactorIsClobberedWithAutoWidt hAndInitialScale1)
1267 {
1268 UseMockScrollbarSettings mockScrollbarSettings;
1269 registerMockedHttpURLLoad("viewport-initial-scale-1.html");
1270
1271 FixedLayoutTestWebViewClient client;
1272 client.m_screenInfo.deviceScaleFactor = 1;
1273 int viewportWidth = 640;
1274 int viewportHeight = 480;
1275 float enforcedPageScalePactor = 0.75f;
1276 float pageScaleFactor = 1.0f;
1277
1278 {
1279 FrameTestHelpers::WebViewHelper webViewHelper;
1280 webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-1.ht ml", true, 0, &client);
1281 webViewHelper.webView()->settings()->setViewportEnabled(true);
1282 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(false);
1283 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1284 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1285
1286 EXPECT_EQ(enforcedPageScalePactor, webViewHelper.webView()->pageScaleFac tor());
1287 }
1288
1289 {
1290 FrameTestHelpers::WebViewHelper webViewHelper;
1291 webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-1.ht ml", true, 0, &client);
1292 webViewHelper.webView()->settings()->setViewportEnabled(true);
1293 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(true);
1294 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1295 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1296
1297 EXPECT_EQ(pageScaleFactor, webViewHelper.webView()->pageScaleFactor());
1298 }
1299 }
1300
1231 TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth) 1301 TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth)
1232 { 1302 {
1233 UseMockScrollbarSettings mockScrollbarSettings; 1303 UseMockScrollbarSettings mockScrollbarSettings;
1234 registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html"); 1304 registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html");
1235 1305
1236 FixedLayoutTestWebViewClient client; 1306 FixedLayoutTestWebViewClient client;
1237 client.m_screenInfo.deviceScaleFactor = 1; 1307 client.m_screenInfo.deviceScaleFactor = 1;
1238 int viewportWidth = 640; 1308 int viewportWidth = 640;
1239 int viewportHeight = 480; 1309 int viewportHeight = 480;
1240 1310
(...skipping 3441 matching lines...) Expand 10 before | Expand all | Expand 10 after
4682 4752
4683 FrameTestHelpers::loadFrame(frame, 4753 FrameTestHelpers::loadFrame(frame,
4684 "javascript:window.frames[1].location.assign('" + m_baseURL + "find.html ')"); 4754 "javascript:window.frames[1].location.assign('" + m_baseURL + "find.html ')");
4685 runPendingTasks(); 4755 runPendingTasks();
4686 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); 4756 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
4687 EXPECT_EQ(client.frame(), iframe); 4757 EXPECT_EQ(client.frame(), iframe);
4688 EXPECT_FALSE(client.replacesCurrentHistoryItem()); 4758 EXPECT_FALSE(client.replacesCurrentHistoryItem());
4689 } 4759 }
4690 4760
4691 } // namespace 4761 } // namespace
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | Source/web/tests/data/viewport-initial-scale-1.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698