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

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: Resolve decoration colors dynamically. Created 6 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/rendering/RenderObject.h
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
index 9c768705a9a7c733437f053dcfa698dd8e57ffa1..a20e0e7d01698e00590b2591ed23906d6012bee3 100644
--- a/Source/core/rendering/RenderObject.h
+++ b/Source/core/rendering/RenderObject.h
@@ -800,13 +800,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'

Powered by Google App Engine
This is Rietveld 408576698