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

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

Issue 19041005: Introduce css3TextEnabled instead of CSS3_TEXT. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 7 years, 5 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
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 , wordBreak(RenderStyle::initialWordBreak()) 69 , wordBreak(RenderStyle::initialWordBreak())
70 , overflowWrap(RenderStyle::initialOverflowWrap()) 70 , overflowWrap(RenderStyle::initialOverflowWrap())
71 , lineBreak(LineBreakAuto) 71 , lineBreak(LineBreakAuto)
72 , resize(RenderStyle::initialResize()) 72 , resize(RenderStyle::initialResize())
73 , userSelect(RenderStyle::initialUserSelect()) 73 , userSelect(RenderStyle::initialUserSelect())
74 , speak(SpeakNormal) 74 , speak(SpeakNormal)
75 , hyphens(HyphensManual) 75 , hyphens(HyphensManual)
76 , textEmphasisFill(TextEmphasisFillFilled) 76 , textEmphasisFill(TextEmphasisFillFilled)
77 , textEmphasisMark(TextEmphasisMarkNone) 77 , textEmphasisMark(TextEmphasisMarkNone)
78 , textEmphasisPosition(TextEmphasisPositionOver) 78 , textEmphasisPosition(TextEmphasisPositionOver)
79 , m_textAlignLast(RenderStyle::initialTextAlignLast())
79 , m_textOrientation(TextOrientationVerticalRight) 80 , m_textOrientation(TextOrientationVerticalRight)
80 #if ENABLE(CSS3_TEXT) 81 #if ENABLE(CSS3_TEXT)
81 , m_textIndentLine(RenderStyle::initialTextIndentLine()) 82 , m_textIndentLine(RenderStyle::initialTextIndentLine())
82 #endif 83 #endif
83 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) 84 , m_lineBoxContain(RenderStyle::initialLineBoxContain())
84 , m_imageRendering(RenderStyle::initialImageRendering()) 85 , m_imageRendering(RenderStyle::initialImageRendering())
85 , m_lineSnap(RenderStyle::initialLineSnap()) 86 , m_lineSnap(RenderStyle::initialLineSnap())
86 , m_lineAlign(RenderStyle::initialLineAlign()) 87 , m_lineAlign(RenderStyle::initialLineAlign())
87 #if ENABLE(CSS3_TEXT) 88 #if ENABLE(CSS3_TEXT)
88 , m_textAlignLast(RenderStyle::initialTextAlignLast())
89 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 89 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
90 #endif // CSS3_TEXT 90 #endif // CSS3_TEXT
91 , m_rubyPosition(RenderStyle::initialRubyPosition()) 91 , m_rubyPosition(RenderStyle::initialRubyPosition())
92 , hyphenationLimitBefore(-1) 92 , hyphenationLimitBefore(-1)
93 , hyphenationLimitAfter(-1) 93 , hyphenationLimitAfter(-1)
94 , hyphenationLimitLines(-1) 94 , hyphenationLimitLines(-1)
95 , m_lineGrid(RenderStyle::initialLineGrid()) 95 , m_lineGrid(RenderStyle::initialLineGrid())
96 , m_tabSize(RenderStyle::initialTabSize()) 96 , m_tabSize(RenderStyle::initialTabSize())
97 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 97 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
98 { 98 {
(...skipping 24 matching lines...) Expand all
123 , wordBreak(o.wordBreak) 123 , wordBreak(o.wordBreak)
124 , overflowWrap(o.overflowWrap) 124 , overflowWrap(o.overflowWrap)
125 , lineBreak(o.lineBreak) 125 , lineBreak(o.lineBreak)
126 , resize(o.resize) 126 , resize(o.resize)
127 , userSelect(o.userSelect) 127 , userSelect(o.userSelect)
128 , speak(o.speak) 128 , speak(o.speak)
129 , hyphens(o.hyphens) 129 , hyphens(o.hyphens)
130 , textEmphasisFill(o.textEmphasisFill) 130 , textEmphasisFill(o.textEmphasisFill)
131 , textEmphasisMark(o.textEmphasisMark) 131 , textEmphasisMark(o.textEmphasisMark)
132 , textEmphasisPosition(o.textEmphasisPosition) 132 , textEmphasisPosition(o.textEmphasisPosition)
133 , m_textAlignLast(o.m_textAlignLast)
133 , m_textOrientation(o.m_textOrientation) 134 , m_textOrientation(o.m_textOrientation)
134 #if ENABLE(CSS3_TEXT) 135 #if ENABLE(CSS3_TEXT)
135 , m_textIndentLine(o.m_textIndentLine) 136 , m_textIndentLine(o.m_textIndentLine)
136 #endif 137 #endif
137 , m_lineBoxContain(o.m_lineBoxContain) 138 , m_lineBoxContain(o.m_lineBoxContain)
138 , m_imageRendering(o.m_imageRendering) 139 , m_imageRendering(o.m_imageRendering)
139 , m_lineSnap(o.m_lineSnap) 140 , m_lineSnap(o.m_lineSnap)
140 , m_lineAlign(o.m_lineAlign) 141 , m_lineAlign(o.m_lineAlign)
141 #if ENABLE(CSS3_TEXT) 142 #if ENABLE(CSS3_TEXT)
142 , m_textAlignLast(o.m_textAlignLast)
143 , m_textUnderlinePosition(o.m_textUnderlinePosition) 143 , m_textUnderlinePosition(o.m_textUnderlinePosition)
144 #endif // CSS3_TEXT 144 #endif // CSS3_TEXT
145 , m_rubyPosition(o.m_rubyPosition) 145 , m_rubyPosition(o.m_rubyPosition)
146 , hyphenationString(o.hyphenationString) 146 , hyphenationString(o.hyphenationString)
147 , hyphenationLimitBefore(o.hyphenationLimitBefore) 147 , hyphenationLimitBefore(o.hyphenationLimitBefore)
148 , hyphenationLimitAfter(o.hyphenationLimitAfter) 148 , hyphenationLimitAfter(o.hyphenationLimitAfter)
149 , hyphenationLimitLines(o.hyphenationLimitLines) 149 , hyphenationLimitLines(o.hyphenationLimitLines)
150 , locale(o.locale) 150 , locale(o.locale)
151 , textEmphasisCustomMark(o.textEmphasisCustomMark) 151 , textEmphasisCustomMark(o.textEmphasisCustomMark)
152 , m_lineGrid(o.m_lineGrid) 152 , m_lineGrid(o.m_lineGrid)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 && resize == o.resize 196 && resize == o.resize
197 && userSelect == o.userSelect 197 && userSelect == o.userSelect
198 && speak == o.speak 198 && speak == o.speak
199 && hyphens == o.hyphens 199 && hyphens == o.hyphens
200 && hyphenationLimitBefore == o.hyphenationLimitBefore 200 && hyphenationLimitBefore == o.hyphenationLimitBefore
201 && hyphenationLimitAfter == o.hyphenationLimitAfter 201 && hyphenationLimitAfter == o.hyphenationLimitAfter
202 && hyphenationLimitLines == o.hyphenationLimitLines 202 && hyphenationLimitLines == o.hyphenationLimitLines
203 && textEmphasisFill == o.textEmphasisFill 203 && textEmphasisFill == o.textEmphasisFill
204 && textEmphasisMark == o.textEmphasisMark 204 && textEmphasisMark == o.textEmphasisMark
205 && textEmphasisPosition == o.textEmphasisPosition 205 && textEmphasisPosition == o.textEmphasisPosition
206 && m_textAlignLast == o.m_textAlignLast
206 && m_textOrientation == o.m_textOrientation 207 && m_textOrientation == o.m_textOrientation
207 #if ENABLE(CSS3_TEXT) 208 #if ENABLE(CSS3_TEXT)
208 && m_textIndentLine == o.m_textIndentLine 209 && m_textIndentLine == o.m_textIndentLine
209 #endif 210 #endif
210 && m_lineBoxContain == o.m_lineBoxContain 211 && m_lineBoxContain == o.m_lineBoxContain
211 && hyphenationString == o.hyphenationString 212 && hyphenationString == o.hyphenationString
212 && locale == o.locale 213 && locale == o.locale
213 && textEmphasisCustomMark == o.textEmphasisCustomMark 214 && textEmphasisCustomMark == o.textEmphasisCustomMark
214 && QuotesData::equals(quotes.get(), o.quotes.get()) 215 && QuotesData::equals(quotes.get(), o.quotes.get())
215 && m_tabSize == o.m_tabSize 216 && m_tabSize == o.m_tabSize
216 && m_lineGrid == o.m_lineGrid 217 && m_lineGrid == o.m_lineGrid
217 && m_imageRendering == o.m_imageRendering 218 && m_imageRendering == o.m_imageRendering
218 #if ENABLE(CSS3_TEXT) 219 #if ENABLE(CSS3_TEXT)
219 && m_textAlignLast == o.m_textAlignLast
220 && m_textUnderlinePosition == o.m_textUnderlinePosition 220 && m_textUnderlinePosition == o.m_textUnderlinePosition
221 #endif // CSS3_TEXT 221 #endif // CSS3_TEXT
222 && m_rubyPosition == o.m_rubyPosition 222 && m_rubyPosition == o.m_rubyPosition
223 && m_lineSnap == o.m_lineSnap 223 && m_lineSnap == o.m_lineSnap
224 && m_variables == o.m_variables 224 && m_variables == o.m_variables
225 && m_lineAlign == o.m_lineAlign 225 && m_lineAlign == o.m_lineAlign
226 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et()); 226 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et());
227 } 227 }
228 228
229 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 229 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
(...skipping 15 matching lines...) Expand all
245 info.addMember(cursorData, "cursorData"); 245 info.addMember(cursorData, "cursorData");
246 info.addMember(hyphenationString, "hyphenationString"); 246 info.addMember(hyphenationString, "hyphenationString");
247 info.addMember(locale, "locale"); 247 info.addMember(locale, "locale");
248 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark"); 248 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark");
249 info.addMember(quotes, "quotes"); 249 info.addMember(quotes, "quotes");
250 info.addMember(m_lineGrid, "lineGrid"); 250 info.addMember(m_lineGrid, "lineGrid");
251 info.addMember(m_variables, "variables"); 251 info.addMember(m_variables, "variables");
252 } 252 }
253 253
254 } // namespace WebCore 254 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698