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

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: 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
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 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 1191
1192 FrameTestHelpers::WebViewHelper webViewHelper; 1192 FrameTestHelpers::WebViewHelper webViewHelper;
1193 webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale. html", true, 0, &client); 1193 webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale. html", true, 0, &client);
1194 webViewHelper.webView()->settings()->setViewportEnabled(true); 1194 webViewHelper.webView()->settings()->setViewportEnabled(true);
1195 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePactor ); 1195 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePactor );
1196 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); 1196 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1197 1197
1198 EXPECT_EQ(enforcedPageScalePactor, webViewHelper.webView()->pageScaleFactor( )); 1198 EXPECT_EQ(enforcedPageScalePactor, webViewHelper.webView()->pageScaleFactor( ));
1199 } 1199 }
1200 1200
1201 TEST_F(WebFrameTest, SmallPermanentInitialPageScaleFactorIsClobberedWithDeviceWi dth)
1202 {
1203 UseMockScrollbarSettings mockScrollbarSettings;
1204 registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html");
1205
1206 FixedLayoutTestWebViewClient client;
1207 client.m_screenInfo.deviceScaleFactor = 1;
1208 int viewportWidth = 640;
1209 int viewportHeight = 480;
1210 float enforcedPageScalePactor = 0.75f;
1211 float pageScaleFactor = 0.5f;
1212
1213 {
1214 FrameTestHelpers::WebViewHelper webViewHelper;
1215 webViewHelper.initializeAndLoad(m_baseURL + "viewport-device-0.5x-initia l-scale.html", true, 0, &client);
1216 webViewHelper.webView()->settings()->setViewportEnabled(true);
1217 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(false);
1218 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1219 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1220
1221 EXPECT_EQ(enforcedPageScalePactor, webViewHelper.webView()->pageScaleFac tor());
1222 }
1223
1224 {
1225 FrameTestHelpers::WebViewHelper webViewHelper;
1226 webViewHelper.initializeAndLoad(m_baseURL + "viewport-device-0.5x-initia l-scale.html", true, 0, &client);
1227 webViewHelper.webView()->settings()->setViewportEnabled(true);
1228 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(true);
1229 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1230 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1231
1232 EXPECT_EQ(pageScaleFactor, webViewHelper.webView()->pageScaleFactor());
1233 }
1234 }
1235
1236 TEST_F(WebFrameTest, SmallPermanentInitialPageScaleFactorIsClobberedWithAutoWidt hAndInitialScale1)
1237 {
1238 UseMockScrollbarSettings mockScrollbarSettings;
1239 registerMockedHttpURLLoad("viewport-initial-scale-1.html");
1240
1241 FixedLayoutTestWebViewClient client;
1242 client.m_screenInfo.deviceScaleFactor = 1;
1243 int viewportWidth = 640;
1244 int viewportHeight = 480;
1245 float enforcedPageScalePactor = 0.75f;
1246 float pageScaleFactor = 1.0f;
1247
1248 {
1249 FrameTestHelpers::WebViewHelper webViewHelper;
1250 webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-1.ht ml", true, 0, &client);
1251 webViewHelper.webView()->settings()->setViewportEnabled(true);
1252 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(false);
1253 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1254 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1255
1256 EXPECT_EQ(enforcedPageScalePactor, webViewHelper.webView()->pageScaleFac tor());
1257 }
1258
1259 {
1260 FrameTestHelpers::WebViewHelper webViewHelper;
1261 webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-1.ht ml", true, 0, &client);
1262 webViewHelper.webView()->settings()->setViewportEnabled(true);
1263 webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuir k(true);
1264 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePa ctor);
1265 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
1266
1267 EXPECT_EQ(pageScaleFactor, webViewHelper.webView()->pageScaleFactor());
1268 }
1269 }
1270
1201 TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth) 1271 TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth)
1202 { 1272 {
1203 UseMockScrollbarSettings mockScrollbarSettings; 1273 UseMockScrollbarSettings mockScrollbarSettings;
1204 registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html"); 1274 registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html");
1205 1275
1206 FixedLayoutTestWebViewClient client; 1276 FixedLayoutTestWebViewClient client;
1207 client.m_screenInfo.deviceScaleFactor = 1; 1277 client.m_screenInfo.deviceScaleFactor = 1;
1208 int viewportWidth = 640; 1278 int viewportWidth = 640;
1209 int viewportHeight = 480; 1279 int viewportHeight = 480;
1210 1280
(...skipping 3387 matching lines...) Expand 10 before | Expand all | Expand 10 after
4598 4668
4599 FrameTestHelpers::loadFrame(frame, 4669 FrameTestHelpers::loadFrame(frame,
4600 "javascript:window.frames[1].location.assign('" + m_baseURL + "find.html ')"); 4670 "javascript:window.frames[1].location.assign('" + m_baseURL + "find.html ')");
4601 runPendingTasks(); 4671 runPendingTasks();
4602 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); 4672 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
4603 EXPECT_EQ(client.frame(), iframe); 4673 EXPECT_EQ(client.frame(), iframe);
4604 EXPECT_FALSE(client.replacesCurrentHistoryItem()); 4674 EXPECT_FALSE(client.replacesCurrentHistoryItem());
4605 } 4675 }
4606 4676
4607 } // namespace 4677 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698