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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/TextPainter.h ('k') | Source/core/paint/ViewDisplayListTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/TextPainter.cpp
diff --git a/Source/core/paint/TextPainter.cpp b/Source/core/paint/TextPainter.cpp
index 6c45d00b717ca75c15c582492be0391a514579d7..6492cfeb14d485b5e914cc316b71440d68ee3391 100644
--- a/Source/core/paint/TextPainter.cpp
+++ b/Source/core/paint/TextPainter.cpp
@@ -7,9 +7,9 @@
#include "core/CSSPropertyNames.h"
#include "core/frame/Settings.h"
+#include "core/layout/LayoutObject.h"
#include "core/layout/line/InlineTextBox.h"
#include "core/rendering/RenderCombineText.h"
-#include "core/rendering/RenderObject.h"
#include "core/rendering/style/RenderStyle.h"
#include "core/rendering/style/ShadowList.h"
#include "platform/fonts/Font.h"
@@ -115,7 +115,7 @@ static Color textColorForWhiteBackground(Color textColor)
}
// static
-TextPainter::Style TextPainter::textPaintingStyle(RenderObject& renderer, const RenderStyle& style, bool forceBlackText, bool isPrinting)
+TextPainter::Style TextPainter::textPaintingStyle(LayoutObject& renderer, const RenderStyle& style, bool forceBlackText, bool isPrinting)
{
TextPainter::Style textStyle;
@@ -154,7 +154,7 @@ TextPainter::Style TextPainter::textPaintingStyle(RenderObject& renderer, const
return textStyle;
}
-TextPainter::Style TextPainter::selectionPaintingStyle(RenderObject& renderer, bool haveSelection, bool forceBlackText, bool isPrinting, const TextPainter::Style& textStyle)
+TextPainter::Style TextPainter::selectionPaintingStyle(LayoutObject& renderer, bool haveSelection, bool forceBlackText, bool isPrinting, const TextPainter::Style& textStyle)
{
TextPainter::Style selectionStyle = textStyle;
« no previous file with comments | « Source/core/paint/TextPainter.h ('k') | Source/core/paint/ViewDisplayListTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698