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

Unified Diff: Source/core/rendering/RenderObject.h

Issue 219633002: Proper support for multiple text decorations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix jchaffraix' issues. Created 6 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/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.h
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
index bbd53eedf4cffd918e1f61829cb4e775fa519cde..cb0284001e823c642feed7b98529dae252c12afc 100644
--- a/Source/core/rendering/RenderObject.h
+++ b/Source/core/rendering/RenderObject.h
@@ -802,13 +802,18 @@ public:
virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
- struct AppliedTextDecoration {
- Color color;
+ struct ResolvedDecoration {
+ ResolvedDecoration();
+ ResolvedDecoration(const AppliedTextDecoration&, const Color&);
+
+ TextDecoration line;
TextDecorationStyle style;
- AppliedTextDecoration() : color(Color::transparent), style(TextDecorationStyleSolid) { }
+ Color color;
};
- void getTextDecorations(unsigned decorations, AppliedTextDecoration& underline, AppliedTextDecoration& overline, AppliedTextDecoration& linethrough, bool quirksMode = false, bool firstlineStyle = false);
+ typedef Vector<ResolvedDecoration, 1> ResolvedDecorationVector;
+
+ void resolvedDecorations(bool firstlineStyle, const Vector<AppliedTextDecoration>&, ResolvedDecorationVector&);
// Return the RenderLayerModelObject in the container chain which is responsible for painting this object, or 0
// if painting is root-relative. This is the container that should be passed to the 'forRepaint'
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698