| OLD | NEW |
| 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 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1412 UseMockScrollbarSettings mockScrollbarSettings; | 1412 UseMockScrollbarSettings mockScrollbarSettings; |
| 1413 const char* pages[] = { | 1413 const char* pages[] = { |
| 1414 // These pages trigger the clobbering condition. There must be a matchin
g item in "pageScaleFactors" array. | 1414 // These pages trigger the clobbering condition. There must be a matchin
g item in "pageScaleFactors" array. |
| 1415 "viewport-device-0.5x-initial-scale.html", | 1415 "viewport-device-0.5x-initial-scale.html", |
| 1416 "viewport-initial-scale-1.html", | 1416 "viewport-initial-scale-1.html", |
| 1417 // These ones do not. | 1417 // These ones do not. |
| 1418 "viewport-auto-initial-scale.html", | 1418 "viewport-auto-initial-scale.html", |
| 1419 "viewport-target-densitydpi-device-and-fixed-width.html" | 1419 "viewport-target-densitydpi-device-and-fixed-width.html" |
| 1420 }; | 1420 }; |
| 1421 float pageScaleFactors[] = { 0.5f, 1.0f }; | 1421 float pageScaleFactors[] = { 0.5f, 1.0f }; |
| 1422 for (size_t i = 0; i < ARRAY_SIZE(pages); ++i) | 1422 for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) |
| 1423 registerMockedHttpURLLoad(pages[i]); | 1423 registerMockedHttpURLLoad(pages[i]); |
| 1424 | 1424 |
| 1425 FixedLayoutTestWebViewClient client; | 1425 FixedLayoutTestWebViewClient client; |
| 1426 client.m_screenInfo.deviceScaleFactor = 1; | 1426 client.m_screenInfo.deviceScaleFactor = 1; |
| 1427 int viewportWidth = 400; | 1427 int viewportWidth = 400; |
| 1428 int viewportHeight = 300; | 1428 int viewportHeight = 300; |
| 1429 float enforcedPageScaleFactor = 0.75f; | 1429 float enforcedPageScaleFactor = 0.75f; |
| 1430 | 1430 |
| 1431 for (size_t i = 0; i < ARRAY_SIZE(pages); ++i) { | 1431 for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) { |
| 1432 for (int quirkEnabled = 0; quirkEnabled <= 1; ++quirkEnabled) { | 1432 for (int quirkEnabled = 0; quirkEnabled <= 1; ++quirkEnabled) { |
| 1433 FrameTestHelpers::WebViewHelper webViewHelper(this); | 1433 FrameTestHelpers::WebViewHelper webViewHelper(this); |
| 1434 webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, 0, &clie
nt, enableViewportSettings); | 1434 webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, 0, &clie
nt, enableViewportSettings); |
| 1435 applyViewportStyleOverride(&webViewHelper); | 1435 applyViewportStyleOverride(&webViewHelper); |
| 1436 webViewHelper.webView()->settings()->setClobberUserAgentInitialScale
Quirk(quirkEnabled); | 1436 webViewHelper.webView()->settings()->setClobberUserAgentInitialScale
Quirk(quirkEnabled); |
| 1437 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageSca
leFactor); | 1437 webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageSca
leFactor); |
| 1438 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeigh
t)); | 1438 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeigh
t)); |
| 1439 | 1439 |
| 1440 float expectedPageScaleFactor = quirkEnabled && i < ARRAY_SIZE(pageS
caleFactors) ? pageScaleFactors[i] : enforcedPageScaleFactor; | 1440 float expectedPageScaleFactor = quirkEnabled && i < WTF_ARRAY_LENGTH
(pageScaleFactors) ? pageScaleFactors[i] : enforcedPageScaleFactor; |
| 1441 EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScal
eFactor()); | 1441 EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScal
eFactor()); |
| 1442 } | 1442 } |
| 1443 } | 1443 } |
| 1444 } | 1444 } |
| 1445 | 1445 |
| 1446 TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorAffectsLayoutWi
dth) | 1446 TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorAffectsLayoutWi
dth) |
| 1447 { | 1447 { |
| 1448 UseMockScrollbarSettings mockScrollbarSettings; | 1448 UseMockScrollbarSettings mockScrollbarSettings; |
| 1449 | 1449 |
| 1450 FixedLayoutTestWebViewClient client; | 1450 FixedLayoutTestWebViewClient client; |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2024 UseMockScrollbarSettings mockScrollbarSettings; | 2024 UseMockScrollbarSettings mockScrollbarSettings; |
| 2025 registerMockedHttpURLLoad("viewport-target-densitydpi-high.html"); | 2025 registerMockedHttpURLLoad("viewport-target-densitydpi-high.html"); |
| 2026 | 2026 |
| 2027 FixedLayoutTestWebViewClient client; | 2027 FixedLayoutTestWebViewClient client; |
| 2028 // high-dpi = 240 | 2028 // high-dpi = 240 |
| 2029 float targetDpi = 240.0f; | 2029 float targetDpi = 240.0f; |
| 2030 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; | 2030 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; |
| 2031 int viewportWidth = 640; | 2031 int viewportWidth = 640; |
| 2032 int viewportHeight = 480; | 2032 int viewportHeight = 480; |
| 2033 | 2033 |
| 2034 for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { | 2034 for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) { |
| 2035 float deviceScaleFactor = deviceScaleFactors[i]; | 2035 float deviceScaleFactor = deviceScaleFactors[i]; |
| 2036 float deviceDpi = deviceScaleFactor * 160.0f; | 2036 float deviceDpi = deviceScaleFactor * 160.0f; |
| 2037 client.m_screenInfo.deviceScaleFactor = deviceScaleFactor; | 2037 client.m_screenInfo.deviceScaleFactor = deviceScaleFactor; |
| 2038 | 2038 |
| 2039 FrameTestHelpers::WebViewHelper webViewHelper(this); | 2039 FrameTestHelpers::WebViewHelper webViewHelper(this); |
| 2040 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-
high.html", true, 0, &client, enableViewportSettings); | 2040 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-
high.html", true, 0, &client, enableViewportSettings); |
| 2041 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); | 2041 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); |
| 2042 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP
I(true); | 2042 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP
I(true); |
| 2043 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); | 2043 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); |
| 2044 | 2044 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 2055 { | 2055 { |
| 2056 UseMockScrollbarSettings mockScrollbarSettings; | 2056 UseMockScrollbarSettings mockScrollbarSettings; |
| 2057 registerMockedHttpURLLoad("viewport-target-densitydpi-device.html"); | 2057 registerMockedHttpURLLoad("viewport-target-densitydpi-device.html"); |
| 2058 | 2058 |
| 2059 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; | 2059 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; |
| 2060 | 2060 |
| 2061 FixedLayoutTestWebViewClient client; | 2061 FixedLayoutTestWebViewClient client; |
| 2062 int viewportWidth = 640; | 2062 int viewportWidth = 640; |
| 2063 int viewportHeight = 480; | 2063 int viewportHeight = 480; |
| 2064 | 2064 |
| 2065 for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { | 2065 for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) { |
| 2066 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; | 2066 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; |
| 2067 | 2067 |
| 2068 FrameTestHelpers::WebViewHelper webViewHelper(this); | 2068 FrameTestHelpers::WebViewHelper webViewHelper(this); |
| 2069 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-
device.html", true, 0, &client, enableViewportSettings); | 2069 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-
device.html", true, 0, &client, enableViewportSettings); |
| 2070 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); | 2070 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); |
| 2071 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP
I(true); | 2071 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP
I(true); |
| 2072 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); | 2072 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); |
| 2073 | 2073 |
| 2074 EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webVi
ewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f
); | 2074 EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webVi
ewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f
); |
| 2075 EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webV
iewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.
0f); | 2075 EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webV
iewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.
0f); |
| 2076 EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.
webView()->pageScaleFactor(), 0.01f); | 2076 EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.
webView()->pageScaleFactor(), 0.01f); |
| 2077 } | 2077 } |
| 2078 } | 2078 } |
| 2079 | 2079 |
| 2080 TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth) | 2080 TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth) |
| 2081 { | 2081 { |
| 2082 UseMockScrollbarSettings mockScrollbarSettings; | 2082 UseMockScrollbarSettings mockScrollbarSettings; |
| 2083 registerMockedHttpURLLoad("viewport-target-densitydpi-device-and-fixed-width
.html"); | 2083 registerMockedHttpURLLoad("viewport-target-densitydpi-device-and-fixed-width
.html"); |
| 2084 | 2084 |
| 2085 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; | 2085 float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f }; |
| 2086 | 2086 |
| 2087 FixedLayoutTestWebViewClient client; | 2087 FixedLayoutTestWebViewClient client; |
| 2088 int viewportWidth = 640; | 2088 int viewportWidth = 640; |
| 2089 int viewportHeight = 480; | 2089 int viewportHeight = 480; |
| 2090 | 2090 |
| 2091 for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { | 2091 for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) { |
| 2092 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; | 2092 client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; |
| 2093 | 2093 |
| 2094 FrameTestHelpers::WebViewHelper webViewHelper(this); | 2094 FrameTestHelpers::WebViewHelper webViewHelper(this); |
| 2095 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-
device-and-fixed-width.html", true, 0, &client, enableViewportSettings); | 2095 webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-
device-and-fixed-width.html", true, 0, &client, enableViewportSettings); |
| 2096 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); | 2096 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); |
| 2097 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP
I(true); | 2097 webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDP
I(true); |
| 2098 webViewHelper.webView()->settings()->setUseWideViewport(true); | 2098 webViewHelper.webView()->settings()->setUseWideViewport(true); |
| 2099 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); | 2099 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); |
| 2100 | 2100 |
| 2101 EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()-
>frameView()->layoutSize().width(), 1.0f); | 2101 EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()-
>frameView()->layoutSize().width(), 1.0f); |
| (...skipping 6174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8276 EXPECT_TRUE(resource); | 8276 EXPECT_TRUE(resource); |
| 8277 EXPECT_NE(0, resource->loadFinishTime()); | 8277 EXPECT_NE(0, resource->loadFinishTime()); |
| 8278 | 8278 |
| 8279 DocumentLoader* loader = document->loader(); | 8279 DocumentLoader* loader = document->loader(); |
| 8280 | 8280 |
| 8281 EXPECT_TRUE(loader); | 8281 EXPECT_TRUE(loader); |
| 8282 EXPECT_EQ(loader->timing().responseEnd(), resource->loadFinishTime()); | 8282 EXPECT_EQ(loader->timing().responseEnd(), resource->loadFinishTime()); |
| 8283 } | 8283 } |
| 8284 | 8284 |
| 8285 } // namespace blink | 8285 } // namespace blink |
| OLD | NEW |