| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index 4ba5c6abac73a93313e60c7177fdb4f04f4f4ab2..f11b77653ba2d75141035fd397f1f2022ba4a008 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -29,7 +29,6 @@
|
| */
|
|
|
| #include "config.h"
|
| -
|
| #include "public/web/WebFrame.h"
|
|
|
| #include "SkBitmap.h"
|
| @@ -762,6 +761,8 @@ TEST_P(ParameterizedWebFrameTest, PostMessageThenDetach)
|
| runPendingTasks();
|
| }
|
|
|
| +namespace {
|
| +
|
| class FixedLayoutTestWebViewClient : public FrameTestHelpers::TestWebViewClient {
|
| public:
|
| virtual WebScreenInfo screenInfo() override { return m_screenInfo; }
|
| @@ -773,7 +774,7 @@ class FakeCompositingWebViewClient : public FixedLayoutTestWebViewClient {
|
| };
|
|
|
| // Viewport settings need to be set before the page gets loaded
|
| -static void enableViewportSettings(WebSettings* settings)
|
| +void enableViewportSettings(WebSettings* settings)
|
| {
|
| settings->setViewportMetaEnabled(true);
|
| settings->setViewportEnabled(true);
|
| @@ -782,7 +783,7 @@ static void enableViewportSettings(WebSettings* settings)
|
| }
|
|
|
| // Helper function to set autosizing multipliers on a document.
|
| -static bool setTextAutosizingMultiplier(Document* document, float multiplier)
|
| +bool setTextAutosizingMultiplier(Document* document, float multiplier)
|
| {
|
| bool multiplierSet = false;
|
| for (LayoutObject* layoutObject = document->layoutView(); layoutObject; layoutObject = layoutObject->nextInPreOrder()) {
|
| @@ -797,7 +798,7 @@ static bool setTextAutosizingMultiplier(Document* document, float multiplier)
|
| }
|
|
|
| // Helper function to check autosizing multipliers on a document.
|
| -static bool checkTextAutosizingMultiplier(Document* document, float multiplier)
|
| +bool checkTextAutosizingMultiplier(Document* document, float multiplier)
|
| {
|
| bool multiplierChecked = false;
|
| for (LayoutObject* layoutObject = document->layoutView(); layoutObject; layoutObject = layoutObject->nextInPreOrder()) {
|
| @@ -809,6 +810,8 @@ static bool checkTextAutosizingMultiplier(Document* document, float multiplier)
|
| return multiplierChecked;
|
| }
|
|
|
| +} // anonymous namespace
|
| +
|
| TEST_P(ParameterizedWebFrameTest, ChangeInFixedLayoutResetsTextAutosizingMultipliers)
|
| {
|
| UseMockScrollbarSettings mockScrollbarSettings;
|
|
|