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 1638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1649 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); | 1649 webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); |
1650 webViewHelper.webView()->layout(); | 1650 webViewHelper.webView()->layout(); |
1651 | 1651 |
1652 EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layo
utSize().height()); | 1652 EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layo
utSize().height()); |
1653 } | 1653 } |
1654 | 1654 |
1655 TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale) | 1655 TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale) |
1656 { | 1656 { |
1657 UseMockScrollbarSettings mockScrollbarSettings; | 1657 UseMockScrollbarSettings mockScrollbarSettings; |
1658 registerMockedHttpURLLoad("wide_document_width_viewport.html"); | 1658 registerMockedHttpURLLoad("wide_document_width_viewport.html"); |
| 1659 registerMockedHttpURLLoad("white-1x1.png"); |
1659 | 1660 |
1660 FixedLayoutTestWebViewClient client; | 1661 FixedLayoutTestWebViewClient client; |
1661 client.m_screenInfo.deviceScaleFactor = 1; | 1662 client.m_screenInfo.deviceScaleFactor = 1; |
1662 int viewportWidth = 600; | 1663 int viewportWidth = 600; |
1663 int viewportHeight = 800; | 1664 int viewportHeight = 800; |
1664 | 1665 |
1665 FrameTestHelpers::WebViewHelper webViewHelper(this); | 1666 FrameTestHelpers::WebViewHelper webViewHelper(this); |
1666 webViewHelper.initializeAndLoad("about:blank", true, 0, &client, enableViewp
ortSettings); | 1667 webViewHelper.initializeAndLoad("about:blank", true, 0, &client, enableViewp
ortSettings); |
1667 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); | 1668 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); |
1668 webViewHelper.webView()->settings()->setUseWideViewport(true); | 1669 webViewHelper.webView()->settings()->setUseWideViewport(true); |
(...skipping 6616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8285 EXPECT_TRUE(resource); | 8286 EXPECT_TRUE(resource); |
8286 EXPECT_NE(0, resource->loadFinishTime()); | 8287 EXPECT_NE(0, resource->loadFinishTime()); |
8287 | 8288 |
8288 DocumentLoader* loader = document->loader(); | 8289 DocumentLoader* loader = document->loader(); |
8289 | 8290 |
8290 EXPECT_TRUE(loader); | 8291 EXPECT_TRUE(loader); |
8291 EXPECT_EQ(loader->timing().responseEnd(), resource->loadFinishTime()); | 8292 EXPECT_EQ(loader->timing().responseEnd(), resource->loadFinishTime()); |
8292 } | 8293 } |
8293 | 8294 |
8294 } // namespace blink | 8295 } // namespace blink |
OLD | NEW |