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

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

Issue 2414343002: Implement MediaValues for initial viewport. (Closed)
Patch Set: CORE_EXPORT in inheritance chain for Windows Created 4 years, 2 months 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
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 2688 matching lines...) Expand 10 before | Expand all | Expand 10 after
2699 webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5); 2699 webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
2700 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true); 2700 webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
2701 webViewHelper.webView()->settings()->setUseWideViewport(false); 2701 webViewHelper.webView()->settings()->setUseWideViewport(false);
2702 webViewHelper.resize(WebSize(viewportWidth, viewportHeight)); 2702 webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
2703 2703
2704 EXPECT_NEAR(1.0f, webViewHelper.webView()->pageScaleFactor(), 0.01f); 2704 EXPECT_NEAR(1.0f, webViewHelper.webView()->pageScaleFactor(), 0.01f);
2705 EXPECT_NEAR(1.0f, webViewHelper.webView()->minimumPageScaleFactor(), 0.01f); 2705 EXPECT_NEAR(1.0f, webViewHelper.webView()->minimumPageScaleFactor(), 0.01f);
2706 EXPECT_NEAR(5.0f, webViewHelper.webView()->maximumPageScaleFactor(), 0.01f); 2706 EXPECT_NEAR(5.0f, webViewHelper.webView()->maximumPageScaleFactor(), 0.01f);
2707 } 2707 }
2708 2708
2709 // TODO(rune@opera.com): Does not pass until we collect author @viewport rules
2710 // before constructing the RuleSets. https://crbug.com/332763
2711 TEST_P(ParameterizedWebFrameTest,
2712 DISABLED_AtViewportInsideAtMediaInitialViewport) {
2713 registerMockedHttpURLLoad("viewport-inside-media.html");
2714
2715 FixedLayoutTestWebViewClient client;
2716 FrameTestHelpers::WebViewHelper webViewHelper;
2717 webViewHelper.initializeAndLoad(m_baseURL + "viewport-inside-media.html",
2718 true, nullptr, &client, nullptr,
2719 enableViewportSettings);
2720 webViewHelper.resize(WebSize(640, 480));
2721
2722 EXPECT_EQ(2000, webViewHelper.webView()
2723 ->mainFrameImpl()
2724 ->frameView()
2725 ->layoutSize()
2726 .width());
2727 }
2728
2709 class WebFrameResizeTest : public ParameterizedWebFrameTest { 2729 class WebFrameResizeTest : public ParameterizedWebFrameTest {
2710 protected: 2730 protected:
2711 static FloatSize computeRelativeOffset(const IntPoint& absoluteOffset, 2731 static FloatSize computeRelativeOffset(const IntPoint& absoluteOffset,
2712 const LayoutRect& rect) { 2732 const LayoutRect& rect) {
2713 FloatSize relativeOffset = 2733 FloatSize relativeOffset =
2714 FloatPoint(absoluteOffset) - FloatPoint(rect.location()); 2734 FloatPoint(absoluteOffset) - FloatPoint(rect.location());
2715 relativeOffset.scale(1.f / rect.width(), 1.f / rect.height()); 2735 relativeOffset.scale(1.f / rect.width(), 1.f / rect.height());
2716 return relativeOffset; 2736 return relativeOffset;
2717 } 2737 }
2718 2738
(...skipping 7478 matching lines...) Expand 10 before | Expand all | Expand 10 after
10197 webViewHelper.webView()->handleInputEvent(endEvent); 10217 webViewHelper.webView()->handleInputEvent(endEvent);
10198 webViewHelper.webView()->handleInputEvent(updateEvent); 10218 webViewHelper.webView()->handleInputEvent(updateEvent);
10199 10219
10200 // Try a full Begin/Update/End cycle. 10220 // Try a full Begin/Update/End cycle.
10201 webViewHelper.webView()->handleInputEvent(beginEvent); 10221 webViewHelper.webView()->handleInputEvent(beginEvent);
10202 webViewHelper.webView()->handleInputEvent(updateEvent); 10222 webViewHelper.webView()->handleInputEvent(updateEvent);
10203 webViewHelper.webView()->handleInputEvent(endEvent); 10223 webViewHelper.webView()->handleInputEvent(endEvent);
10204 } 10224 }
10205 10225
10206 } // namespace blink 10226 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698