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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

Issue 2394273006: Add CSS support for text-decoration-skip (Closed)
Patch Set: Histograms typo fixed, DCHECK Created 4 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 textEmphasisMark(TextEmphasisMarkNone), 86 textEmphasisMark(TextEmphasisMarkNone),
87 textEmphasisPosition(TextEmphasisPositionOver), 87 textEmphasisPosition(TextEmphasisPositionOver),
88 m_textAlignLast(ComputedStyle::initialTextAlignLast()), 88 m_textAlignLast(ComputedStyle::initialTextAlignLast()),
89 m_textJustify(ComputedStyle::initialTextJustify()), 89 m_textJustify(ComputedStyle::initialTextJustify()),
90 m_textOrientation(TextOrientationMixed), 90 m_textOrientation(TextOrientationMixed),
91 m_textCombine(ComputedStyle::initialTextCombine()), 91 m_textCombine(ComputedStyle::initialTextCombine()),
92 m_textIndentLine(ComputedStyle::initialTextIndentLine()), 92 m_textIndentLine(ComputedStyle::initialTextIndentLine()),
93 m_textIndentType(ComputedStyle::initialTextIndentLine()), 93 m_textIndentType(ComputedStyle::initialTextIndentLine()),
94 m_imageRendering(ComputedStyle::initialImageRendering()), 94 m_imageRendering(ComputedStyle::initialImageRendering()),
95 m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()), 95 m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()),
96 m_textDecorationSkip(ComputedStyle::initialTextDecorationSkip()),
96 m_rubyPosition(ComputedStyle::initialRubyPosition()), 97 m_rubyPosition(ComputedStyle::initialRubyPosition()),
97 m_subtreeWillChangeContents(false), 98 m_subtreeWillChangeContents(false),
98 m_selfOrAncestorHasDirAutoAttribute(false), 99 m_selfOrAncestorHasDirAutoAttribute(false),
99 m_respectImageOrientation(false), 100 m_respectImageOrientation(false),
100 m_snapHeightPosition(0), 101 m_snapHeightPosition(0),
101 hyphenationLimitBefore(-1), 102 hyphenationLimitBefore(-1),
102 hyphenationLimitAfter(-1), 103 hyphenationLimitAfter(-1),
103 hyphenationLimitLines(-1), 104 hyphenationLimitLines(-1),
104 m_snapHeightUnit(0), 105 m_snapHeightUnit(0),
105 tapHighlightColor(ComputedStyle::initialTapHighlightColor()), 106 tapHighlightColor(ComputedStyle::initialTapHighlightColor()),
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 textEmphasisMark(o.textEmphasisMark), 145 textEmphasisMark(o.textEmphasisMark),
145 textEmphasisPosition(o.textEmphasisPosition), 146 textEmphasisPosition(o.textEmphasisPosition),
146 m_textAlignLast(o.m_textAlignLast), 147 m_textAlignLast(o.m_textAlignLast),
147 m_textJustify(o.m_textJustify), 148 m_textJustify(o.m_textJustify),
148 m_textOrientation(o.m_textOrientation), 149 m_textOrientation(o.m_textOrientation),
149 m_textCombine(o.m_textCombine), 150 m_textCombine(o.m_textCombine),
150 m_textIndentLine(o.m_textIndentLine), 151 m_textIndentLine(o.m_textIndentLine),
151 m_textIndentType(o.m_textIndentType), 152 m_textIndentType(o.m_textIndentType),
152 m_imageRendering(o.m_imageRendering), 153 m_imageRendering(o.m_imageRendering),
153 m_textUnderlinePosition(o.m_textUnderlinePosition), 154 m_textUnderlinePosition(o.m_textUnderlinePosition),
155 m_textDecorationSkip(o.m_textDecorationSkip),
154 m_rubyPosition(o.m_rubyPosition), 156 m_rubyPosition(o.m_rubyPosition),
155 m_subtreeWillChangeContents(o.m_subtreeWillChangeContents), 157 m_subtreeWillChangeContents(o.m_subtreeWillChangeContents),
156 m_selfOrAncestorHasDirAutoAttribute( 158 m_selfOrAncestorHasDirAutoAttribute(
157 o.m_selfOrAncestorHasDirAutoAttribute), 159 o.m_selfOrAncestorHasDirAutoAttribute),
158 m_respectImageOrientation(o.m_respectImageOrientation), 160 m_respectImageOrientation(o.m_respectImageOrientation),
159 m_snapHeightPosition(o.m_snapHeightPosition), 161 m_snapHeightPosition(o.m_snapHeightPosition),
160 hyphenationString(o.hyphenationString), 162 hyphenationString(o.hyphenationString),
161 hyphenationLimitBefore(o.hyphenationLimitBefore), 163 hyphenationLimitBefore(o.hyphenationLimitBefore),
162 hyphenationLimitAfter(o.hyphenationLimitAfter), 164 hyphenationLimitAfter(o.hyphenationLimitAfter),
163 hyphenationLimitLines(o.hyphenationLimitLines), 165 hyphenationLimitLines(o.hyphenationLimitLines),
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 m_selfOrAncestorHasDirAutoAttribute == 216 m_selfOrAncestorHasDirAutoAttribute ==
215 o.m_selfOrAncestorHasDirAutoAttribute && 217 o.m_selfOrAncestorHasDirAutoAttribute &&
216 m_respectImageOrientation == o.m_respectImageOrientation && 218 m_respectImageOrientation == o.m_respectImageOrientation &&
217 m_snapHeightPosition == o.m_snapHeightPosition && 219 m_snapHeightPosition == o.m_snapHeightPosition &&
218 hyphenationString == o.hyphenationString && 220 hyphenationString == o.hyphenationString &&
219 m_snapHeightUnit == o.m_snapHeightUnit && 221 m_snapHeightUnit == o.m_snapHeightUnit &&
220 textEmphasisCustomMark == o.textEmphasisCustomMark && 222 textEmphasisCustomMark == o.textEmphasisCustomMark &&
221 quotesDataEquivalent(o) && m_tabSize == o.m_tabSize && 223 quotesDataEquivalent(o) && m_tabSize == o.m_tabSize &&
222 m_imageRendering == o.m_imageRendering && 224 m_imageRendering == o.m_imageRendering &&
223 m_textUnderlinePosition == o.m_textUnderlinePosition && 225 m_textUnderlinePosition == o.m_textUnderlinePosition &&
226 m_textDecorationSkip == o.m_textDecorationSkip &&
224 m_rubyPosition == o.m_rubyPosition && 227 m_rubyPosition == o.m_rubyPosition &&
225 dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) && 228 dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) &&
226 dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) && 229 dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) &&
227 dataEquivalent(variables, o.variables) && 230 dataEquivalent(variables, o.variables) &&
228 m_textSizeAdjust == o.m_textSizeAdjust; 231 m_textSizeAdjust == o.m_textSizeAdjust;
229 } 232 }
230 233
231 bool StyleRareInheritedData::shadowDataEquivalent( 234 bool StyleRareInheritedData::shadowDataEquivalent(
232 const StyleRareInheritedData& o) const { 235 const StyleRareInheritedData& o) const {
233 return dataEquivalent(textShadow.get(), o.textShadow.get()); 236 return dataEquivalent(textShadow.get(), o.textShadow.get());
234 } 237 }
235 238
236 bool StyleRareInheritedData::quotesDataEquivalent( 239 bool StyleRareInheritedData::quotesDataEquivalent(
237 const StyleRareInheritedData& o) const { 240 const StyleRareInheritedData& o) const {
238 return dataEquivalent(quotes, o.quotes); 241 return dataEquivalent(quotes, o.quotes);
239 } 242 }
240 243
241 } // namespace blink 244 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareInheritedData.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698