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

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

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a typo in css-properties-as-js-properties-expected-expected.txt Created 7 years, 7 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 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #endif 83 #endif
84 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) 84 , m_lineBoxContain(RenderStyle::initialLineBoxContain())
85 , m_imageRendering(RenderStyle::initialImageRendering()) 85 , m_imageRendering(RenderStyle::initialImageRendering())
86 , m_lineSnap(RenderStyle::initialLineSnap()) 86 , m_lineSnap(RenderStyle::initialLineSnap())
87 , m_lineAlign(RenderStyle::initialLineAlign()) 87 , m_lineAlign(RenderStyle::initialLineAlign())
88 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 88 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
89 , useTouchOverflowScrolling(RenderStyle::initialUseTouchOverflowScrolling()) 89 , useTouchOverflowScrolling(RenderStyle::initialUseTouchOverflowScrolling())
90 #endif 90 #endif
91 #if ENABLE(CSS3_TEXT) 91 #if ENABLE(CSS3_TEXT)
92 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 92 , m_textAlignLast(RenderStyle::initialTextAlignLast())
93 #endif // CSS3_TEXT
93 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 94 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
94 #endif // CSS3_TEXT
95 , m_rubyPosition(RenderStyle::initialRubyPosition()) 95 , m_rubyPosition(RenderStyle::initialRubyPosition())
96 , hyphenationLimitBefore(-1) 96 , hyphenationLimitBefore(-1)
97 , hyphenationLimitAfter(-1) 97 , hyphenationLimitAfter(-1)
98 , hyphenationLimitLines(-1) 98 , hyphenationLimitLines(-1)
99 , m_lineGrid(RenderStyle::initialLineGrid()) 99 , m_lineGrid(RenderStyle::initialLineGrid())
100 , m_tabSize(RenderStyle::initialTabSize()) 100 , m_tabSize(RenderStyle::initialTabSize())
101 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 101 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
102 { 102 {
103 m_variables.init(); 103 m_variables.init();
104 } 104 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #endif 141 #endif
142 , m_lineBoxContain(o.m_lineBoxContain) 142 , m_lineBoxContain(o.m_lineBoxContain)
143 , m_imageRendering(o.m_imageRendering) 143 , m_imageRendering(o.m_imageRendering)
144 , m_lineSnap(o.m_lineSnap) 144 , m_lineSnap(o.m_lineSnap)
145 , m_lineAlign(o.m_lineAlign) 145 , m_lineAlign(o.m_lineAlign)
146 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 146 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
147 , useTouchOverflowScrolling(o.useTouchOverflowScrolling) 147 , useTouchOverflowScrolling(o.useTouchOverflowScrolling)
148 #endif 148 #endif
149 #if ENABLE(CSS3_TEXT) 149 #if ENABLE(CSS3_TEXT)
150 , m_textAlignLast(o.m_textAlignLast) 150 , m_textAlignLast(o.m_textAlignLast)
151 #endif // CSS3_TEXT
151 , m_textUnderlinePosition(o.m_textUnderlinePosition) 152 , m_textUnderlinePosition(o.m_textUnderlinePosition)
152 #endif // CSS3_TEXT
153 , m_rubyPosition(o.m_rubyPosition) 153 , m_rubyPosition(o.m_rubyPosition)
154 , hyphenationString(o.hyphenationString) 154 , hyphenationString(o.hyphenationString)
155 , hyphenationLimitBefore(o.hyphenationLimitBefore) 155 , hyphenationLimitBefore(o.hyphenationLimitBefore)
156 , hyphenationLimitAfter(o.hyphenationLimitAfter) 156 , hyphenationLimitAfter(o.hyphenationLimitAfter)
157 , hyphenationLimitLines(o.hyphenationLimitLines) 157 , hyphenationLimitLines(o.hyphenationLimitLines)
158 , locale(o.locale) 158 , locale(o.locale)
159 , textEmphasisCustomMark(o.textEmphasisCustomMark) 159 , textEmphasisCustomMark(o.textEmphasisCustomMark)
160 , m_lineGrid(o.m_lineGrid) 160 , m_lineGrid(o.m_lineGrid)
161 , m_tabSize(o.m_tabSize) 161 , m_tabSize(o.m_tabSize)
162 , tapHighlightColor(o.tapHighlightColor) 162 , tapHighlightColor(o.tapHighlightColor)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 && m_lineBoxContain == o.m_lineBoxContain 222 && m_lineBoxContain == o.m_lineBoxContain
223 && hyphenationString == o.hyphenationString 223 && hyphenationString == o.hyphenationString
224 && locale == o.locale 224 && locale == o.locale
225 && textEmphasisCustomMark == o.textEmphasisCustomMark 225 && textEmphasisCustomMark == o.textEmphasisCustomMark
226 && QuotesData::equals(quotes.get(), o.quotes.get()) 226 && QuotesData::equals(quotes.get(), o.quotes.get())
227 && m_tabSize == o.m_tabSize 227 && m_tabSize == o.m_tabSize
228 && m_lineGrid == o.m_lineGrid 228 && m_lineGrid == o.m_lineGrid
229 && m_imageRendering == o.m_imageRendering 229 && m_imageRendering == o.m_imageRendering
230 #if ENABLE(CSS3_TEXT) 230 #if ENABLE(CSS3_TEXT)
231 && m_textAlignLast == o.m_textAlignLast 231 && m_textAlignLast == o.m_textAlignLast
232 #endif // CSS3_TEXT
232 && m_textUnderlinePosition == o.m_textUnderlinePosition 233 && m_textUnderlinePosition == o.m_textUnderlinePosition
233 #endif // CSS3_TEXT
234 && m_rubyPosition == o.m_rubyPosition 234 && m_rubyPosition == o.m_rubyPosition
235 && m_lineSnap == o.m_lineSnap 235 && m_lineSnap == o.m_lineSnap
236 && m_variables == o.m_variables 236 && m_variables == o.m_variables
237 && m_lineAlign == o.m_lineAlign 237 && m_lineAlign == o.m_lineAlign
238 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et()); 238 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et());
239 } 239 }
240 240
241 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 241 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
242 { 242 {
243 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) 243 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow))
(...skipping 13 matching lines...) Expand all
257 info.addMember(cursorData, "cursorData"); 257 info.addMember(cursorData, "cursorData");
258 info.addMember(hyphenationString, "hyphenationString"); 258 info.addMember(hyphenationString, "hyphenationString");
259 info.addMember(locale, "locale"); 259 info.addMember(locale, "locale");
260 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark"); 260 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark");
261 info.addMember(quotes, "quotes"); 261 info.addMember(quotes, "quotes");
262 info.addMember(m_lineGrid, "lineGrid"); 262 info.addMember(m_lineGrid, "lineGrid");
263 info.addMember(m_variables, "variables"); 263 info.addMember(m_variables, "variables");
264 } 264 }
265 265
266 } // namespace WebCore 266 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698