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

Unified Diff: Source/core/paint/TextPainterTest.cpp

Issue 1126883002: Change all one-off lifecycle callers to FrameView::updateLayoutAndStyleForPainting (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayer.cpp ('k') | Source/web/WebAXObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/TextPainterTest.cpp
diff --git a/Source/core/paint/TextPainterTest.cpp b/Source/core/paint/TextPainterTest.cpp
index 72053aaac1aee09acaa217952152459cf41e3fd1..1f2e172914462a72c595209e1f77c790b0c2ae85 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()->updateLayoutAndStyleIfNeededRecursive();
+ document().view()->updateLayoutAndStyleForPainting();
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()->updateLayoutAndStyleIfNeededRecursive();
+ document().view()->updateLayoutAndStyleForPainting();
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()->updateLayoutAndStyleIfNeededRecursive();
+ document().view()->updateLayoutAndStyleForPainting();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
*layoutText(), layoutText()->styleRef(), true /* forceBlackText */, false /* isPrinting */);
@@ -100,7 +100,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBackgroundToWhite_NoAdjustmentNee
document().body()->setInlineStyleProperty(CSSPropertyWebkitTextEmphasisColor, CSSValueBlue);
document().body()->setInlineStyleProperty(CSSPropertyWebkitPrintColorAdjust, CSSValueEconomy);
document().settings()->setShouldPrintBackgrounds(false);
- document().view()->updateLayoutAndStyleIfNeededRecursive();
+ document().view()->updateLayoutAndStyleForPainting();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
*layoutText(), layoutText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
@@ -116,7 +116,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBackgroundToWhite_Darkened)
document().body()->setInlineStyleProperty(CSSPropertyWebkitTextEmphasisColor, "rgb(220, 220, 255)");
document().body()->setInlineStyleProperty(CSSPropertyWebkitPrintColorAdjust, CSSValueEconomy);
document().settings()->setShouldPrintBackgrounds(false);
- document().view()->updateLayoutAndStyleIfNeededRecursive();
+ document().view()->updateLayoutAndStyleForPainting();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
*layoutText(), layoutText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayer.cpp ('k') | Source/web/WebAXObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698