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

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

Issue 1406183010: Replace ARRAY_SIZE with WTF_ARRAY_LENGTH (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp ('k') | no next file » | 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 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 { 1387 {
1388 const char* pages[] = { 1388 const char* pages[] = {
1389 // These pages trigger the clobbering condition. There must be a matchin g item in "pageScaleFactors" array. 1389 // These pages trigger the clobbering condition. There must be a matchin g item in "pageScaleFactors" array.
1390 "viewport-device-0.5x-initial-scale.html", 1390 "viewport-device-0.5x-initial-scale.html",
1391 "viewport-initial-scale-1.html", 1391 "viewport-initial-scale-1.html",
1392 // These ones do not. 1392 // These ones do not.
1393 "viewport-auto-initial-scale.html", 1393 "viewport-auto-initial-scale.html",
1394 "viewport-target-densitydpi-device-and-fixed-width.html" 1394 "viewport-target-densitydpi-device-and-fixed-width.html"
1395 }; 1395 };
1396 float pageScaleFactors[] = { 0.5f, 1.0f }; 1396 float pageScaleFactors[] = { 0.5f, 1.0f };
1397 for (size_t i = 0; i < ARRAY_SIZE(pages); ++i) 1397 for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i)
1398 registerMockedHttpURLLoad(pages[i]); 1398 registerMockedHttpURLLoad(pages[i]);
1399 1399
1400 FixedLayoutTestWebViewClient client; 1400 FixedLayoutTestWebViewClient client;
1401 client.m_screenInfo.deviceScaleFactor = 1; 1401 client.m_screenInfo.deviceScaleFactor = 1;
1402 int viewportWidth = 400; 1402 int viewportWidth = 400;
1403 int viewportHeight = 300; 1403 int viewportHeight = 300;
1404 float enforcedPageScaleFactor = 0.75f; 1404 float enforcedPageScaleFactor = 0.75f;
1405 1405
1406 for (size_t i = 0; i < ARRAY_SIZE(pages); ++i) { 1406 for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) {
1407 for (int quirkEnabled = 0; quirkEnabled <= 1; ++quirkEnabled) { 1407 for (int quirkEnabled = 0; quirkEnabled <= 1; ++quirkEnabled) {
1408 FrameTestHelpers::WebViewHelper webViewHelper(this); 1408 FrameTestHelpers::WebViewHelper webViewHelper(this);
1409 webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, 0, &clie nt, enableViewportSettings); 1409 webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, 0, &clie nt, enableViewportSettings);
1410 applyViewportStyleOverride(&webViewHelper); 1410 applyViewportStyleOverride(&webViewHelper);
1411 webViewHelper.webView()->settings()->setClobberUserAgentInitialScale Quirk(quirkEnabled); 1411 webViewHelper.webView()->settings()->setClobberUserAgentInitialScale Quirk(quirkEnabled);
1412 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageSca leFactor); 1412 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageSca leFactor);
1413 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeigh t)); 1413 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeigh t));
1414 1414
1415 float expectedPageScaleFactor = quirkEnabled && i < ARRAY_SIZE(pageS caleFactors) ? pageScaleFactors[i] : enforcedPageScaleFactor; 1415 float expectedPageScaleFactor = quirkEnabled && i < WTF_ARRAY_LENGTH (pageScaleFactors) ? pageScaleFactors[i] : enforcedPageScaleFactor;
1416 EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScal eFactor()); 1416 EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScal eFactor());
1417 } 1417 }
1418 } 1418 }
1419 } 1419 }
1420 1420
1421 TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorAffectsLayoutWi dth) 1421 TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorAffectsLayoutWi dth)
1422 { 1422 {
1423 FixedLayoutTestWebViewClient client; 1423 FixedLayoutTestWebViewClient client;
1424 client.m_screenInfo.deviceScaleFactor = 1; 1424 client.m_screenInfo.deviceScaleFactor = 1;
1425 int viewportWidth = 640; 1425 int viewportWidth = 640;
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 { 2042 {
2043 registerMockedHttpURLLoad("viewport-target-densitydpi-high.html"); 2043 registerMockedHttpURLLoad("viewport-target-densitydpi-high.html");
2044 2044
2045 FixedLayoutTestWebViewClient client; 2045 FixedLayoutTestWebViewClient client;
2046 // high-dpi = 240 2046 // high-dpi = 240
2047 float targetDpi = 240.0f; 2047 float targetDpi = 240.0f;
2048 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; 2048 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
2049 int viewportWidth = 640; 2049 int viewportWidth = 640;
2050 int viewportHeight = 480; 2050 int viewportHeight = 480;
2051 2051
2052 for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { 2052 for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) {
2053 float deviceScaleFactor = deviceScaleFactors[i]; 2053 float deviceScaleFactor = deviceScaleFactors[i];
2054 float deviceDpi = deviceScaleFactor * 160.0f; 2054 float deviceDpi = deviceScaleFactor * 160.0f;
2055 client.m_screenInfo.deviceScaleFactor = deviceScaleFactor; 2055 client.m_screenInfo.deviceScaleFactor = deviceScaleFactor;
2056 2056
2057 FrameTestHelpers::WebViewHelper webViewHelper(this); 2057 FrameTestHelpers::WebViewHelper webViewHelper(this);
2058 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi- high.html", true, 0, &client, enableViewportSettings); 2058 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi- high.html", true, 0, &client, enableViewportSettings);
2059 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); 2059 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
2060 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP I(true); 2060 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP I(true);
2061 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); 2061 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
2062 2062
2063 // We need to account for the fact that logical pixels are unconditional ly multiplied by deviceScaleFactor to produce 2063 // We need to account for the fact that logical pixels are unconditional ly multiplied by deviceScaleFactor to produce
2064 // physical pixels. 2064 // physical pixels.
2065 float densityDpiScaleRatio = deviceScaleFactor * targetDpi / deviceDpi; 2065 float densityDpiScaleRatio = deviceScaleFactor * targetDpi / deviceDpi;
2066 EXPECT_NEAR(viewportWidth * densityDpiScaleRatio, webViewHelper.webViewI mpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f); 2066 EXPECT_NEAR(viewportWidth * densityDpiScaleRatio, webViewHelper.webViewI mpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
2067 EXPECT_NEAR(viewportHeight * densityDpiScaleRatio, webViewHelper.webView Impl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f); 2067 EXPECT_NEAR(viewportHeight * densityDpiScaleRatio, webViewHelper.webView Impl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
2068 EXPECT_NEAR(1.0f / densityDpiScaleRatio, webViewHelper.webView()->pageSc aleFactor(), 0.01f); 2068 EXPECT_NEAR(1.0f / densityDpiScaleRatio, webViewHelper.webView()->pageSc aleFactor(), 0.01f);
2069 } 2069 }
2070 } 2070 }
2071 2071
2072 TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice) 2072 TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice)
2073 { 2073 {
2074 registerMockedHttpURLLoad("viewport-target-densitydpi-device.html"); 2074 registerMockedHttpURLLoad("viewport-target-densitydpi-device.html");
2075 2075
2076 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; 2076 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
2077 2077
2078 FixedLayoutTestWebViewClient client; 2078 FixedLayoutTestWebViewClient client;
2079 int viewportWidth = 640; 2079 int viewportWidth = 640;
2080 int viewportHeight = 480; 2080 int viewportHeight = 480;
2081 2081
2082 for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { 2082 for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) {
2083 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; 2083 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
2084 2084
2085 FrameTestHelpers::WebViewHelper webViewHelper(this); 2085 FrameTestHelpers::WebViewHelper webViewHelper(this);
2086 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi- device.html", true, 0, &client, enableViewportSettings); 2086 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi- device.html", true, 0, &client, enableViewportSettings);
2087 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); 2087 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
2088 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP I(true); 2088 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP I(true);
2089 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); 2089 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
2090 2090
2091 EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webVi ewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f ); 2091 EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webVi ewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f );
2092 EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webV iewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1. 0f); 2092 EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webV iewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1. 0f);
2093 EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper. webView()->pageScaleFactor(), 0.01f); 2093 EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper. webView()->pageScaleFactor(), 0.01f);
2094 } 2094 }
2095 } 2095 }
2096 2096
2097 TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth) 2097 TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth)
2098 { 2098 {
2099 registerMockedHttpURLLoad("viewport-target-densitydpi-device-and-fixed-width .html"); 2099 registerMockedHttpURLLoad("viewport-target-densitydpi-device-and-fixed-width .html");
2100 2100
2101 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; 2101 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
2102 2102
2103 FixedLayoutTestWebViewClient client; 2103 FixedLayoutTestWebViewClient client;
2104 int viewportWidth = 640; 2104 int viewportWidth = 640;
2105 int viewportHeight = 480; 2105 int viewportHeight = 480;
2106 2106
2107 for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { 2107 for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) {
2108 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; 2108 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
2109 2109
2110 FrameTestHelpers::WebViewHelper webViewHelper(this); 2110 FrameTestHelpers::WebViewHelper webViewHelper(this);
2111 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi- device-and-fixed-width.html", true, 0, &client, enableViewportSettings); 2111 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi- device-and-fixed-width.html", true, 0, &client, enableViewportSettings);
2112 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); 2112 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
2113 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP I(true); 2113 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP I(true);
2114 webViewHelper.webView()->settings()->setUseWideViewport(true); 2114 webViewHelper.webView()->settings()->setUseWideViewport(true);
2115 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); 2115 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
2116 2116
2117 EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()- >frameView()->layoutSize().width(), 1.0f); 2117 EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()- >frameView()->layoutSize().width(), 1.0f);
(...skipping 6204 matching lines...) Expand 10 before | Expand all | Expand 10 after
8322 8322
8323 TEST_F(WebFrameTest, CallbackOrdering) 8323 TEST_F(WebFrameTest, CallbackOrdering)
8324 { 8324 {
8325 registerMockedHttpURLLoad("foo.html"); 8325 registerMockedHttpURLLoad("foo.html");
8326 FrameTestHelpers::WebViewHelper webViewHelper; 8326 FrameTestHelpers::WebViewHelper webViewHelper;
8327 CallbackOrderingWebFrameClient client; 8327 CallbackOrderingWebFrameClient client;
8328 webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true, &client); 8328 webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true, &client);
8329 } 8329 }
8330 8330
8331 } // namespace blink 8331 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698