| Index: Source/core/paint/TextPainterTest.cpp
|
| diff --git a/Source/core/paint/TextPainterTest.cpp b/Source/core/paint/TextPainterTest.cpp
|
| index 4aa6eab06a6600341041fa80ff2dcd8eb32138d2..e86299564356ce78b00740836a9e529d5eb9c944 100644
|
| --- a/Source/core/paint/TextPainterTest.cpp
|
| +++ b/Source/core/paint/TextPainterTest.cpp
|
| @@ -41,7 +41,7 @@ private:
|
| TEST_F(TextPainterTest, TextPaintingStyle_Simple)
|
| {
|
| document().body()->setInlineStyleProperty(CSSPropertyColor, CSSValueBlue);
|
| - document().view()->updateLayoutAndStyleForPainting();
|
| + document().view()->updateAllLifecyclePhases();
|
|
|
| TextPainter::Style textStyle = TextPainter::textPaintingStyle(
|
| *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, false /* isPrinting */);
|
| @@ -59,7 +59,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_AllProperties)
|
| document().body()->setInlineStyleProperty(CSSPropertyWebkitTextEmphasisColor, CSSValueBlue);
|
| document().body()->setInlineStyleProperty(CSSPropertyWebkitTextStrokeWidth, 4, CSSPrimitiveValue::CSS_PX);
|
| document().body()->setInlineStyleProperty(CSSPropertyTextShadow, "1px 2px 3px yellow");
|
| - document().view()->updateLayoutAndStyleForPainting();
|
| + document().view()->updateAllLifecyclePhases();
|
|
|
| TextPainter::Style textStyle = TextPainter::textPaintingStyle(
|
| *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, false /* isPrinting */);
|
| @@ -82,7 +82,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBlackText)
|
| document().body()->setInlineStyleProperty(CSSPropertyWebkitTextEmphasisColor, CSSValueBlue);
|
| document().body()->setInlineStyleProperty(CSSPropertyWebkitTextStrokeWidth, 4, CSSPrimitiveValue::CSS_PX);
|
| document().body()->setInlineStyleProperty(CSSPropertyTextShadow, "1px 2px 3px yellow");
|
| - document().view()->updateLayoutAndStyleForPainting();
|
| + document().view()->updateAllLifecyclePhases();
|
|
|
| TextPainter::Style textStyle = TextPainter::textPaintingStyle(
|
| *layoutText(), layoutText()->styleRef(), true /* forceBlackText */, false /* isPrinting */);
|
| @@ -101,7 +101,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBackgroundToWhite_NoAdjustmentNee
|
| document().body()->setInlineStyleProperty(CSSPropertyWebkitPrintColorAdjust, CSSValueEconomy);
|
| document().settings()->setShouldPrintBackgrounds(false);
|
| document().setPrinting(true);
|
| - document().view()->updateLayoutAndStyleForPainting();
|
| + document().view()->updateAllLifecyclePhases();
|
|
|
| TextPainter::Style textStyle = TextPainter::textPaintingStyle(
|
| *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
|
| @@ -118,7 +118,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBackgroundToWhite_Darkened)
|
| document().body()->setInlineStyleProperty(CSSPropertyWebkitPrintColorAdjust, CSSValueEconomy);
|
| document().settings()->setShouldPrintBackgrounds(false);
|
| document().setPrinting(true);
|
| - document().view()->updateLayoutAndStyleForPainting();
|
| + document().view()->updateAllLifecyclePhases();
|
|
|
| TextPainter::Style textStyle = TextPainter::textPaintingStyle(
|
| *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
|
|
|