Source/core/style/StyleRareInheritedData.h - Issue 1328283005: Add support for multiple text decorations with same line positioning

Side by Side Diff: Source/core/style/StyleRareInheritedData.h

Issue 1328283005: Add support for multiple text decorations with same line positioning (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Review feedback Created 5 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« Source/core/paint/InlineTextBoxPainter.cpp ('K') | « Source/core/style/ComputedStyle.cpp ('k') | Source/core/style/StyleRareInheritedData.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.

6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)	6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 unsigned textEmphasisMark : 3; // TextEmphasisMark	126 unsigned textEmphasisMark : 3; // TextEmphasisMark

127 unsigned textEmphasisPosition : 1; // TextEmphasisPosition	127 unsigned textEmphasisPosition : 1; // TextEmphasisPosition

128 unsigned m_textAlignLast : 3; // TextAlignLast	128 unsigned m_textAlignLast : 3; // TextAlignLast

129 unsigned m_textJustify : 2; // TextJustify	129 unsigned m_textJustify : 2; // TextJustify

130 unsigned m_textOrientation : 2; // TextOrientation	130 unsigned m_textOrientation : 2; // TextOrientation

131 unsigned m_textCombine : 1; // CSS3 text-combine properties	131 unsigned m_textCombine : 1; // CSS3 text-combine properties

132 unsigned m_textIndentLine : 1; // TextIndentEachLine	132 unsigned m_textIndentLine : 1; // TextIndentEachLine

133 unsigned m_textIndentType : 1; // TextIndentHanging	133 unsigned m_textIndentType : 1; // TextIndentHanging

134 // CSS Image Values Level 3	134 // CSS Image Values Level 3

135 unsigned m_imageRendering : 3; // EImageRendering	135 unsigned m_imageRendering : 3; // EImageRendering

136 unsigned m_textUnderlinePosition : 1; // TextUnderlinePosition	136 unsigned m_hasSimpleUnderlinePosition : 1; // TextUnderlinePosition

137 unsigned m_rubyPosition : 1; // RubyPosition	137 unsigned m_rubyPosition : 1; // RubyPosition

138	138

139 // Though will-change is not itself an inherited property, the intent	139 // Though will-change is not itself an inherited property, the intent

140 // expressed by 'will-change: contents' includes descendants.	140 // expressed by 'will-change: contents' includes descendants.

141 unsigned m_subtreeWillChangeContents : 1;	141 unsigned m_subtreeWillChangeContents : 1;

142	142

143 unsigned m_selfOrAncestorHasDirAutoAttribute : 1;	143 unsigned m_selfOrAncestorHasDirAutoAttribute : 1;

144	144

145 unsigned m_respectImageOrientation : 1;	145 unsigned m_respectImageOrientation : 1;

146	146

147 AtomicString hyphenationString;	147 AtomicString hyphenationString;

148 short hyphenationLimitBefore;	148 short hyphenationLimitBefore;

149 short hyphenationLimitAfter;	149 short hyphenationLimitAfter;

150 short hyphenationLimitLines;	150 short hyphenationLimitLines;

151	151

152 AtomicString locale;	152 AtomicString locale;

153	153

154 AtomicString textEmphasisCustomMark;	154 AtomicString textEmphasisCustomMark;

155 RefPtr<QuotesData> quotes;	155 RefPtr<QuotesData> quotes;

156	156

157 Color tapHighlightColor;	157 Color tapHighlightColor;

158	158

	159 Color simpleUnderlineColor;

	160 Color simpleUnderlineVisitedColor;

159 RefPtr<AppliedTextDecorationList> appliedTextDecorations;	161 RefPtr<AppliedTextDecorationList> appliedTextDecorations;

160 TabSize m_tabSize;	162 TabSize m_tabSize;

161	163

162 private:	164 private:

163 StyleRareInheritedData();	165 StyleRareInheritedData();

164 StyleRareInheritedData(const StyleRareInheritedData&);	166 StyleRareInheritedData(const StyleRareInheritedData&);

165 };	167 };

166	168

167 } // namespace blink	169 } // namespace blink

168	170

169 #endif // StyleRareInheritedData_h	171 #endif // StyleRareInheritedData_h

OLD	NEW