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

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

Issue 1055683008: Rename variable name from renderText to layoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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
Index: Source/core/paint/TextPainterTest.cpp
diff --git a/Source/core/paint/TextPainterTest.cpp b/Source/core/paint/TextPainterTest.cpp
index c9713a0c72364a694628dece24cddb1618b3af4b..b0f7e84a49da3a1c1f1ed42fd37a99a954af4dd8 100644
--- a/Source/core/paint/TextPainterTest.cpp
+++ b/Source/core/paint/TextPainterTest.cpp
@@ -23,7 +23,7 @@ public:
TextPainterTest() : m_renderText(nullptr) { }
protected:
- LayoutText* renderText() { return m_renderText; }
+ LayoutText* layoutText() { return m_renderText; }
private:
virtual void SetUp() override
@@ -44,7 +44,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_Simple)
document().view()->updateLayoutAndStyleIfNeededRecursive();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
- *renderText(), renderText()->styleRef(), false /* forceBlackText */, false /* isPrinting */);
+ *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, false /* isPrinting */);
EXPECT_EQ(Color(0, 0, 255), textStyle.fillColor);
EXPECT_EQ(Color(0, 0, 255), textStyle.strokeColor);
EXPECT_EQ(Color(0, 0, 255), textStyle.emphasisMarkColor);
@@ -62,7 +62,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_AllProperties)
document().view()->updateLayoutAndStyleIfNeededRecursive();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
- *renderText(), renderText()->styleRef(), false /* forceBlackText */, false /* isPrinting */);
+ *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, false /* isPrinting */);
EXPECT_EQ(Color(255, 0, 0), textStyle.fillColor);
EXPECT_EQ(Color(0, 255, 0), textStyle.strokeColor);
EXPECT_EQ(Color(0, 0, 255), textStyle.emphasisMarkColor);
@@ -85,7 +85,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBlackText)
document().view()->updateLayoutAndStyleIfNeededRecursive();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
- *renderText(), renderText()->styleRef(), true /* forceBlackText */, false /* isPrinting */);
+ *layoutText(), layoutText()->styleRef(), true /* forceBlackText */, false /* isPrinting */);
EXPECT_EQ(Color::black, textStyle.fillColor);
EXPECT_EQ(Color::black, textStyle.strokeColor);
EXPECT_EQ(Color::black, textStyle.emphasisMarkColor);
@@ -103,7 +103,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBackgroundToWhite_NoAdjustmentNee
document().view()->updateLayoutAndStyleIfNeededRecursive();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
- *renderText(), renderText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
+ *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
EXPECT_EQ(Color(255, 0, 0), textStyle.fillColor);
EXPECT_EQ(Color(0, 255, 0), textStyle.strokeColor);
EXPECT_EQ(Color(0, 0, 255), textStyle.emphasisMarkColor);
@@ -119,7 +119,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_ForceBackgroundToWhite_Darkened)
document().view()->updateLayoutAndStyleIfNeededRecursive();
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
- *renderText(), renderText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
+ *layoutText(), layoutText()->styleRef(), false /* forceBlackText */, true /* isPrinting */);
EXPECT_EQ(Color(255, 220, 220).dark(), textStyle.fillColor);
EXPECT_EQ(Color(220, 255, 220).dark(), textStyle.strokeColor);
EXPECT_EQ(Color(220, 220, 255).dark(), textStyle.emphasisMarkColor);
« no previous file with comments | « Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | Source/modules/accessibility/AXInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698