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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 224723023: Implements hanging property for text-indent from CSS3 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update description Created 6 years, 8 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 , userSelect(RenderStyle::initialUserSelect()) 75 , userSelect(RenderStyle::initialUserSelect())
76 , speak(SpeakNormal) 76 , speak(SpeakNormal)
77 , hyphens(HyphensManual) 77 , hyphens(HyphensManual)
78 , textEmphasisFill(TextEmphasisFillFilled) 78 , textEmphasisFill(TextEmphasisFillFilled)
79 , textEmphasisMark(TextEmphasisMarkNone) 79 , textEmphasisMark(TextEmphasisMarkNone)
80 , textEmphasisPosition(TextEmphasisPositionOver) 80 , textEmphasisPosition(TextEmphasisPositionOver)
81 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 81 , m_textAlignLast(RenderStyle::initialTextAlignLast())
82 , m_textJustify(RenderStyle::initialTextJustify()) 82 , m_textJustify(RenderStyle::initialTextJustify())
83 , m_textOrientation(TextOrientationVerticalRight) 83 , m_textOrientation(TextOrientationVerticalRight)
84 , m_textIndentLine(RenderStyle::initialTextIndentLine()) 84 , m_textIndentLine(RenderStyle::initialTextIndentLine())
85 , m_textIndentType(RenderStyle::initialTextIndentLine())
85 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) 86 , m_lineBoxContain(RenderStyle::initialLineBoxContain())
86 , m_imageRendering(RenderStyle::initialImageRendering()) 87 , m_imageRendering(RenderStyle::initialImageRendering())
87 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 88 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
88 , m_rubyPosition(RenderStyle::initialRubyPosition()) 89 , m_rubyPosition(RenderStyle::initialRubyPosition())
89 , m_touchActionDelay(RenderStyle::initialTouchActionDelay()) 90 , m_touchActionDelay(RenderStyle::initialTouchActionDelay())
90 , hyphenationLimitBefore(-1) 91 , hyphenationLimitBefore(-1)
91 , hyphenationLimitAfter(-1) 92 , hyphenationLimitAfter(-1)
92 , hyphenationLimitLines(-1) 93 , hyphenationLimitLines(-1)
93 , m_tabSize(RenderStyle::initialTabSize()) 94 , m_tabSize(RenderStyle::initialTabSize())
94 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 95 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 , userSelect(o.userSelect) 130 , userSelect(o.userSelect)
130 , speak(o.speak) 131 , speak(o.speak)
131 , hyphens(o.hyphens) 132 , hyphens(o.hyphens)
132 , textEmphasisFill(o.textEmphasisFill) 133 , textEmphasisFill(o.textEmphasisFill)
133 , textEmphasisMark(o.textEmphasisMark) 134 , textEmphasisMark(o.textEmphasisMark)
134 , textEmphasisPosition(o.textEmphasisPosition) 135 , textEmphasisPosition(o.textEmphasisPosition)
135 , m_textAlignLast(o.m_textAlignLast) 136 , m_textAlignLast(o.m_textAlignLast)
136 , m_textJustify(o.m_textJustify) 137 , m_textJustify(o.m_textJustify)
137 , m_textOrientation(o.m_textOrientation) 138 , m_textOrientation(o.m_textOrientation)
138 , m_textIndentLine(o.m_textIndentLine) 139 , m_textIndentLine(o.m_textIndentLine)
140 , m_textIndentType(o.m_textIndentType)
139 , m_lineBoxContain(o.m_lineBoxContain) 141 , m_lineBoxContain(o.m_lineBoxContain)
140 , m_imageRendering(o.m_imageRendering) 142 , m_imageRendering(o.m_imageRendering)
141 , m_textUnderlinePosition(o.m_textUnderlinePosition) 143 , m_textUnderlinePosition(o.m_textUnderlinePosition)
142 , m_rubyPosition(o.m_rubyPosition) 144 , m_rubyPosition(o.m_rubyPosition)
143 , m_touchActionDelay(o.m_touchActionDelay) 145 , m_touchActionDelay(o.m_touchActionDelay)
144 , hyphenationString(o.hyphenationString) 146 , hyphenationString(o.hyphenationString)
145 , hyphenationLimitBefore(o.hyphenationLimitBefore) 147 , hyphenationLimitBefore(o.hyphenationLimitBefore)
146 , hyphenationLimitAfter(o.hyphenationLimitAfter) 148 , hyphenationLimitAfter(o.hyphenationLimitAfter)
147 , hyphenationLimitLines(o.hyphenationLimitLines) 149 , hyphenationLimitLines(o.hyphenationLimitLines)
148 , locale(o.locale) 150 , locale(o.locale)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 && hyphenationLimitAfter == o.hyphenationLimitAfter 205 && hyphenationLimitAfter == o.hyphenationLimitAfter
204 && hyphenationLimitLines == o.hyphenationLimitLines 206 && hyphenationLimitLines == o.hyphenationLimitLines
205 && textEmphasisFill == o.textEmphasisFill 207 && textEmphasisFill == o.textEmphasisFill
206 && textEmphasisMark == o.textEmphasisMark 208 && textEmphasisMark == o.textEmphasisMark
207 && textEmphasisPosition == o.textEmphasisPosition 209 && textEmphasisPosition == o.textEmphasisPosition
208 && m_touchActionDelay == o.m_touchActionDelay 210 && m_touchActionDelay == o.m_touchActionDelay
209 && m_textAlignLast == o.m_textAlignLast 211 && m_textAlignLast == o.m_textAlignLast
210 && m_textJustify == o.m_textJustify 212 && m_textJustify == o.m_textJustify
211 && m_textOrientation == o.m_textOrientation 213 && m_textOrientation == o.m_textOrientation
212 && m_textIndentLine == o.m_textIndentLine 214 && m_textIndentLine == o.m_textIndentLine
215 && m_textIndentType == o.m_textIndentType
213 && m_lineBoxContain == o.m_lineBoxContain 216 && m_lineBoxContain == o.m_lineBoxContain
214 && hyphenationString == o.hyphenationString 217 && hyphenationString == o.hyphenationString
215 && locale == o.locale 218 && locale == o.locale
216 && textEmphasisCustomMark == o.textEmphasisCustomMark 219 && textEmphasisCustomMark == o.textEmphasisCustomMark
217 && quotes.get() == o.quotes.get() 220 && quotes.get() == o.quotes.get()
218 && m_tabSize == o.m_tabSize 221 && m_tabSize == o.m_tabSize
219 && m_imageRendering == o.m_imageRendering 222 && m_imageRendering == o.m_imageRendering
220 && m_textUnderlinePosition == o.m_textUnderlinePosition 223 && m_textUnderlinePosition == o.m_textUnderlinePosition
221 && m_rubyPosition == o.m_rubyPosition 224 && m_rubyPosition == o.m_rubyPosition
222 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et()); 225 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g et());
223 } 226 }
224 227
225 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 228 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
226 { 229 {
227 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) 230 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow))
228 return false; 231 return false;
229 if (textShadow && o.textShadow && (*textShadow != *o.textShadow)) 232 if (textShadow && o.textShadow && (*textShadow != *o.textShadow))
230 return false; 233 return false;
231 return true; 234 return true;
232 } 235 }
233 236
234 } // namespace WebCore 237 } // 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