| Index: third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp b/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp
|
| index 92b780462819c7112bc1546413613d9a6a4362c5..e14a4d87911106eea90fbbd86431bda745470f61 100644
|
| --- a/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/TextAutosizerTest.cpp
|
| @@ -40,7 +40,8 @@ TEST_F(TextAutosizerTest, SimpleParagraph) {
|
| Element* autosized = document().getElementById("autosized");
|
| EXPECT_FLOAT_EQ(16.f,
|
| autosized->layoutObject()->style()->specifiedFontSize());
|
| - // (specified font-size = 16px) * (viewport width = 800px) / (window width = 320px) = 40px.
|
| + // (specified font-size = 16px) * (viewport width = 800px) /
|
| + // (window width = 320px) = 40px.
|
| EXPECT_FLOAT_EQ(40.f, autosized->layoutObject()->style()->computedFontSize());
|
| }
|
|
|
| @@ -331,7 +332,8 @@ TEST_F(TextAutosizerTest, AccessibilityFontScaleFactor) {
|
| Element* autosized = document().getElementById("autosized");
|
| EXPECT_FLOAT_EQ(16.f,
|
| autosized->layoutObject()->style()->specifiedFontSize());
|
| - // 1.5 * (specified font-size = 16px) * (viewport width = 800px) / (window width = 320px) = 60px.
|
| + // 1.5 * (specified font-size = 16px) * (viewport width = 800px) /
|
| + // (window width = 320px) = 60px.
|
| EXPECT_FLOAT_EQ(60.f, autosized->layoutObject()->style()->computedFontSize());
|
| }
|
|
|
| @@ -358,7 +360,8 @@ TEST_F(TextAutosizerTest, ChangingAccessibilityFontScaleFactor) {
|
| Element* autosized = document().getElementById("autosized");
|
| EXPECT_FLOAT_EQ(16.f,
|
| autosized->layoutObject()->style()->specifiedFontSize());
|
| - // 1.0 * (specified font-size = 16px) * (viewport width = 800px) / (window width = 320px) = 40px.
|
| + // 1.0 * (specified font-size = 16px) * (viewport width = 800px) /
|
| + // (window width = 320px) = 40px.
|
| EXPECT_FLOAT_EQ(40.f, autosized->layoutObject()->style()->computedFontSize());
|
|
|
| document().settings()->setAccessibilityFontScaleFactor(2);
|
| @@ -366,7 +369,8 @@ TEST_F(TextAutosizerTest, ChangingAccessibilityFontScaleFactor) {
|
|
|
| EXPECT_FLOAT_EQ(16.f,
|
| autosized->layoutObject()->style()->specifiedFontSize());
|
| - // 2.0 * (specified font-size = 16px) * (viewport width = 800px) / (window width = 320px) = 80px.
|
| + // 2.0 * (specified font-size = 16px) * (viewport width = 800px) /
|
| + // (window width = 320px) = 80px.
|
| EXPECT_FLOAT_EQ(80.f, autosized->layoutObject()->style()->computedFontSize());
|
| }
|
|
|
| @@ -418,7 +422,8 @@ TEST_F(TextAutosizerTest, TextSizeAdjustDoesNotDisableAccessibility) {
|
| EXPECT_FLOAT_EQ(
|
| 48.f, textSizeAdjustDouble->layoutObject()->style()->computedFontSize());
|
|
|
| - // Changing the accessibility font scale factor should change the adjusted size.
|
| + // Changing the accessibility font scale factor should change the adjusted
|
| + // size.
|
| document().settings()->setAccessibilityFontScaleFactor(2);
|
| document().view()->updateAllLifecyclePhases();
|
|
|
| @@ -483,7 +488,8 @@ TEST_F(TextAutosizerTest, DeviceScaleAdjustmentWithViewport) {
|
| Element* autosized = document().getElementById("autosized");
|
| EXPECT_FLOAT_EQ(16.f,
|
| autosized->layoutObject()->style()->specifiedFontSize());
|
| - // (specified font-size = 16px) * (viewport width = 800px) / (window width = 320px) = 40px.
|
| + // (specified font-size = 16px) * (viewport width = 800px) /
|
| + // (window width = 320px) = 40px.
|
| // The device scale adjustment of 1.5 is ignored.
|
| EXPECT_FLOAT_EQ(40.f, autosized->layoutObject()->style()->computedFontSize());
|
|
|
| @@ -493,7 +499,8 @@ TEST_F(TextAutosizerTest, DeviceScaleAdjustmentWithViewport) {
|
| autosized = document().getElementById("autosized");
|
| EXPECT_FLOAT_EQ(16.f,
|
| autosized->layoutObject()->style()->specifiedFontSize());
|
| - // (device scale adjustment = 1.5) * (specified font-size = 16px) * (viewport width = 800px) / (window width = 320px) = 60px.
|
| + // (device scale adjustment = 1.5) * (specified font-size = 16px) *
|
| + // (viewport width = 800px) / (window width = 320px) = 60px.
|
| EXPECT_FLOAT_EQ(60.f, autosized->layoutObject()->style()->computedFontSize());
|
| }
|
|
|
|
|