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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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/TableCellPainter.cpp ('k') | Source/core/paint/TextPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/TextPainter.h
diff --git a/Source/core/paint/TextPainter.h b/Source/core/paint/TextPainter.h
index 483572070c5f6c966b974442f2cfb050cee0736d..7af8f36f1d7728afed9246619cec967f1c3d6ff1 100644
--- a/Source/core/paint/TextPainter.h
+++ b/Source/core/paint/TextPainter.h
@@ -6,7 +6,7 @@
#define TextPainter_h
#include "core/layout/line/FloatToLayoutUnit.h"
-#include "core/layout/style/LayoutStyleConstants.h"
+#include "core/layout/style/ComputedStyleConstants.h"
#include "platform/fonts/TextBlob.h"
#include "platform/geometry/FloatPoint.h"
#include "platform/geometry/FloatRect.h"
@@ -21,7 +21,7 @@ class GraphicsContext;
class GraphicsContextStateSaver;
class LayoutTextCombine;
class LayoutObject;
-class LayoutStyle;
+class ComputedStyle;
class ShadowList;
class TextRun;
struct TextRunPaintInfo;
@@ -57,7 +57,7 @@ public:
}
bool operator!=(const Style& other) { return !(*this == other); }
};
- static Style textPaintingStyle(LayoutObject&, const LayoutStyle&, bool forceBlackText, bool isPrinting);
+ static Style textPaintingStyle(LayoutObject&, const ComputedStyle&, bool forceBlackText, bool isPrinting);
static Style selectionPaintingStyle(LayoutObject&, bool haveSelection, bool forceBlackText, bool isPrinting, const Style& textStyle);
enum RotationDirection { Counterclockwise, Clockwise };
« no previous file with comments | « Source/core/paint/TableCellPainter.cpp ('k') | Source/core/paint/TextPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698