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

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

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/TextPainter.h ('k') | Source/core/paint/ViewPainter.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 069506e6e067a6e8a9a527800068685396fd5b62..c76e02eed559d48c4d4df36aee54d6fbfb406634 100644
--- a/Source/core/paint/TextPainter.cpp
+++ b/Source/core/paint/TextPainter.cpp
@@ -10,7 +10,7 @@
#include "core/layout/LayoutObject.h"
#include "core/layout/LayoutTextCombine.h"
#include "core/layout/line/InlineTextBox.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
#include "core/layout/style/ShadowList.h"
#include "platform/fonts/Font.h"
#include "platform/graphics/GraphicsContext.h"
@@ -115,7 +115,7 @@ static Color textColorForWhiteBackground(Color textColor)
}
// static
-TextPainter::Style TextPainter::textPaintingStyle(LayoutObject& renderer, const LayoutStyle& style, bool forceBlackText, bool isPrinting)
+TextPainter::Style TextPainter::textPaintingStyle(LayoutObject& renderer, const ComputedStyle& style, bool forceBlackText, bool isPrinting)
{
TextPainter::Style textStyle;
@@ -164,7 +164,7 @@ TextPainter::Style TextPainter::selectionPaintingStyle(LayoutObject& renderer, b
selectionStyle.emphasisMarkColor = renderer.selectionEmphasisMarkColor();
}
- if (const LayoutStyle* pseudoStyle = renderer.getCachedPseudoStyle(SELECTION)) {
+ if (const ComputedStyle* pseudoStyle = renderer.getCachedPseudoStyle(SELECTION)) {
selectionStyle.strokeColor = forceBlackText ? Color::black : renderer.resolveColor(*pseudoStyle, CSSPropertyWebkitTextStrokeColor);
selectionStyle.strokeWidth = pseudoStyle->textStrokeWidth();
selectionStyle.shadow = forceBlackText ? 0 : pseudoStyle->textShadow();
« no previous file with comments | « Source/core/paint/TextPainter.h ('k') | Source/core/paint/ViewPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698