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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.cpp

Issue 40733004: Replace compile flag with runtime check for text-underline-position (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed a typo in static function compileUnderlineOffset signature / Rebase Created 7 years, 1 month 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
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 reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 , textEmphasisMark(TextEmphasisMarkNone) 75 , textEmphasisMark(TextEmphasisMarkNone)
76 , textEmphasisPosition(TextEmphasisPositionOver) 76 , textEmphasisPosition(TextEmphasisPositionOver)
77 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 77 , m_textAlignLast(RenderStyle::initialTextAlignLast())
78 , m_textJustify(RenderStyle::initialTextJustify()) 78 , m_textJustify(RenderStyle::initialTextJustify())
79 , m_textOrientation(TextOrientationVerticalRight) 79 , m_textOrientation(TextOrientationVerticalRight)
80 , m_textIndentLine(RenderStyle::initialTextIndentLine()) 80 , m_textIndentLine(RenderStyle::initialTextIndentLine())
81 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) 81 , m_lineBoxContain(RenderStyle::initialLineBoxContain())
82 , m_imageRendering(RenderStyle::initialImageRendering()) 82 , m_imageRendering(RenderStyle::initialImageRendering())
83 , m_lineSnap(RenderStyle::initialLineSnap()) 83 , m_lineSnap(RenderStyle::initialLineSnap())
84 , m_lineAlign(RenderStyle::initialLineAlign()) 84 , m_lineAlign(RenderStyle::initialLineAlign())
85 #if ENABLE(CSS3_TEXT)
86 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 85 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
87 #endif // CSS3_TEXT
88 , m_rubyPosition(RenderStyle::initialRubyPosition()) 86 , m_rubyPosition(RenderStyle::initialRubyPosition())
89 , m_touchActionDelay(RenderStyle::initialTouchActionDelay()) 87 , m_touchActionDelay(RenderStyle::initialTouchActionDelay())
90 , hyphenationLimitBefore(-1) 88 , hyphenationLimitBefore(-1)
91 , hyphenationLimitAfter(-1) 89 , hyphenationLimitAfter(-1)
92 , hyphenationLimitLines(-1) 90 , hyphenationLimitLines(-1)
93 , m_lineGrid(RenderStyle::initialLineGrid()) 91 , m_lineGrid(RenderStyle::initialLineGrid())
94 , m_tabSize(RenderStyle::initialTabSize()) 92 , m_tabSize(RenderStyle::initialTabSize())
95 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 93 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
96 { 94 {
97 m_variables.init(); 95 m_variables.init();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 , textEmphasisMark(o.textEmphasisMark) 127 , textEmphasisMark(o.textEmphasisMark)
130 , textEmphasisPosition(o.textEmphasisPosition) 128 , textEmphasisPosition(o.textEmphasisPosition)
131 , m_textAlignLast(o.m_textAlignLast) 129 , m_textAlignLast(o.m_textAlignLast)
132 , m_textJustify(o.m_textJustify) 130 , m_textJustify(o.m_textJustify)
133 , m_textOrientation(o.m_textOrientation) 131 , m_textOrientation(o.m_textOrientation)
134 , m_textIndentLine(o.m_textIndentLine) 132 , m_textIndentLine(o.m_textIndentLine)
135 , m_lineBoxContain(o.m_lineBoxContain) 133 , m_lineBoxContain(o.m_lineBoxContain)
136 , m_imageRendering(o.m_imageRendering) 134 , m_imageRendering(o.m_imageRendering)
137 , m_lineSnap(o.m_lineSnap) 135 , m_lineSnap(o.m_lineSnap)
138 , m_lineAlign(o.m_lineAlign) 136 , m_lineAlign(o.m_lineAlign)
139 #if ENABLE(CSS3_TEXT)
140 , m_textUnderlinePosition(o.m_textUnderlinePosition) 137 , m_textUnderlinePosition(o.m_textUnderlinePosition)
141 #endif // CSS3_TEXT
142 , m_rubyPosition(o.m_rubyPosition) 138 , m_rubyPosition(o.m_rubyPosition)
143 , m_touchActionDelay(o.m_touchActionDelay) 139 , m_touchActionDelay(o.m_touchActionDelay)
144 , hyphenationString(o.hyphenationString) 140 , hyphenationString(o.hyphenationString)
145 , hyphenationLimitBefore(o.hyphenationLimitBefore) 141 , hyphenationLimitBefore(o.hyphenationLimitBefore)
146 , hyphenationLimitAfter(o.hyphenationLimitAfter) 142 , hyphenationLimitAfter(o.hyphenationLimitAfter)
147 , hyphenationLimitLines(o.hyphenationLimitLines) 143 , hyphenationLimitLines(o.hyphenationLimitLines)
148 , locale(o.locale) 144 , locale(o.locale)
149 , textEmphasisCustomMark(o.textEmphasisCustomMark) 145 , textEmphasisCustomMark(o.textEmphasisCustomMark)
150 , m_lineGrid(o.m_lineGrid) 146 , m_lineGrid(o.m_lineGrid)
151 , m_tabSize(o.m_tabSize) 147 , m_tabSize(o.m_tabSize)
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 && m_textOrientation == o.m_textOrientation 203 && m_textOrientation == o.m_textOrientation
208 && m_textIndentLine == o.m_textIndentLine 204 && m_textIndentLine == o.m_textIndentLine
209 && m_lineBoxContain == o.m_lineBoxContain 205 && m_lineBoxContain == o.m_lineBoxContain
210 && hyphenationString == o.hyphenationString 206 && hyphenationString == o.hyphenationString
211 && locale == o.locale 207 && locale == o.locale
212 && textEmphasisCustomMark == o.textEmphasisCustomMark 208 && textEmphasisCustomMark == o.textEmphasisCustomMark
213 && QuotesData::equals(quotes.get(), o.quotes.get()) 209 && QuotesData::equals(quotes.get(), o.quotes.get())
214 && m_tabSize == o.m_tabSize 210 && m_tabSize == o.m_tabSize
215 && m_lineGrid == o.m_lineGrid 211 && m_lineGrid == o.m_lineGrid
216 && m_imageRendering == o.m_imageRendering 212 && m_imageRendering == o.m_imageRendering
217 #if ENABLE(CSS3_TEXT)
218 && m_textUnderlinePosition == o.m_textUnderlinePosition 213 && m_textUnderlinePosition == o.m_textUnderlinePosition
219 #endif // CSS3_TEXT
220 && m_rubyPosition == o.m_rubyPosition 214 && m_rubyPosition == o.m_rubyPosition
221 && m_lineSnap == o.m_lineSnap 215 && m_lineSnap == o.m_lineSnap
222 && m_variables == o.m_variables 216 && m_variables == o.m_variables
223 && m_lineAlign == o.m_lineAlign 217 && m_lineAlign == o.m_lineAlign
224 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et()); 218 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et());
225 } 219 }
226 220
227 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 221 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
228 { 222 {
229 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) 223 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow))
230 return false; 224 return false;
231 if (textShadow && o.textShadow && (*textShadow != *o.textShadow)) 225 if (textShadow && o.textShadow && (*textShadow != *o.textShadow))
232 return false; 226 return false;
233 return true; 227 return true;
234 } 228 }
235 229
236 } // namespace WebCore 230 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698