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

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

Issue 1328673003: Remove -webkit-line-box-contain implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix up a few more tests. Created 5 years, 3 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/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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 , hyphens(HyphensManual) 82 , hyphens(HyphensManual)
83 , textEmphasisFill(TextEmphasisFillFilled) 83 , textEmphasisFill(TextEmphasisFillFilled)
84 , textEmphasisMark(TextEmphasisMarkNone) 84 , textEmphasisMark(TextEmphasisMarkNone)
85 , textEmphasisPosition(TextEmphasisPositionOver) 85 , textEmphasisPosition(TextEmphasisPositionOver)
86 , m_textAlignLast(ComputedStyle::initialTextAlignLast()) 86 , m_textAlignLast(ComputedStyle::initialTextAlignLast())
87 , m_textJustify(ComputedStyle::initialTextJustify()) 87 , m_textJustify(ComputedStyle::initialTextJustify())
88 , m_textOrientation(TextOrientationVerticalRight) 88 , m_textOrientation(TextOrientationVerticalRight)
89 , m_textCombine(ComputedStyle::initialTextCombine()) 89 , m_textCombine(ComputedStyle::initialTextCombine())
90 , m_textIndentLine(ComputedStyle::initialTextIndentLine()) 90 , m_textIndentLine(ComputedStyle::initialTextIndentLine())
91 , m_textIndentType(ComputedStyle::initialTextIndentLine()) 91 , m_textIndentType(ComputedStyle::initialTextIndentLine())
92 , m_lineBoxContain(ComputedStyle::initialLineBoxContain())
93 , m_imageRendering(ComputedStyle::initialImageRendering()) 92 , m_imageRendering(ComputedStyle::initialImageRendering())
94 , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()) 93 , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
95 , m_rubyPosition(ComputedStyle::initialRubyPosition()) 94 , m_rubyPosition(ComputedStyle::initialRubyPosition())
96 , m_subtreeWillChangeContents(false) 95 , m_subtreeWillChangeContents(false)
97 , m_selfOrAncestorHasDirAutoAttribute(false) 96 , m_selfOrAncestorHasDirAutoAttribute(false)
98 , m_respectImageOrientation(false) 97 , m_respectImageOrientation(false)
99 , hyphenationLimitBefore(-1) 98 , hyphenationLimitBefore(-1)
100 , hyphenationLimitAfter(-1) 99 , hyphenationLimitAfter(-1)
101 , hyphenationLimitLines(-1) 100 , hyphenationLimitLines(-1)
102 , tapHighlightColor(ComputedStyle::initialTapHighlightColor()) 101 , tapHighlightColor(ComputedStyle::initialTapHighlightColor())
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 , hyphens(o.hyphens) 137 , hyphens(o.hyphens)
139 , textEmphasisFill(o.textEmphasisFill) 138 , textEmphasisFill(o.textEmphasisFill)
140 , textEmphasisMark(o.textEmphasisMark) 139 , textEmphasisMark(o.textEmphasisMark)
141 , textEmphasisPosition(o.textEmphasisPosition) 140 , textEmphasisPosition(o.textEmphasisPosition)
142 , m_textAlignLast(o.m_textAlignLast) 141 , m_textAlignLast(o.m_textAlignLast)
143 , m_textJustify(o.m_textJustify) 142 , m_textJustify(o.m_textJustify)
144 , m_textOrientation(o.m_textOrientation) 143 , m_textOrientation(o.m_textOrientation)
145 , m_textCombine(o.m_textCombine) 144 , m_textCombine(o.m_textCombine)
146 , m_textIndentLine(o.m_textIndentLine) 145 , m_textIndentLine(o.m_textIndentLine)
147 , m_textIndentType(o.m_textIndentType) 146 , m_textIndentType(o.m_textIndentType)
148 , m_lineBoxContain(o.m_lineBoxContain)
149 , m_imageRendering(o.m_imageRendering) 147 , m_imageRendering(o.m_imageRendering)
150 , m_textUnderlinePosition(o.m_textUnderlinePosition) 148 , m_textUnderlinePosition(o.m_textUnderlinePosition)
151 , m_rubyPosition(o.m_rubyPosition) 149 , m_rubyPosition(o.m_rubyPosition)
152 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents) 150 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
153 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute) 151 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute)
154 , m_respectImageOrientation(o.m_respectImageOrientation) 152 , m_respectImageOrientation(o.m_respectImageOrientation)
155 , hyphenationString(o.hyphenationString) 153 , hyphenationString(o.hyphenationString)
156 , hyphenationLimitBefore(o.hyphenationLimitBefore) 154 , hyphenationLimitBefore(o.hyphenationLimitBefore)
157 , hyphenationLimitAfter(o.hyphenationLimitAfter) 155 , hyphenationLimitAfter(o.hyphenationLimitAfter)
158 , hyphenationLimitLines(o.hyphenationLimitLines) 156 , hyphenationLimitLines(o.hyphenationLimitLines)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 && hyphenationLimitLines == o.hyphenationLimitLines 203 && hyphenationLimitLines == o.hyphenationLimitLines
206 && textEmphasisFill == o.textEmphasisFill 204 && textEmphasisFill == o.textEmphasisFill
207 && textEmphasisMark == o.textEmphasisMark 205 && textEmphasisMark == o.textEmphasisMark
208 && textEmphasisPosition == o.textEmphasisPosition 206 && textEmphasisPosition == o.textEmphasisPosition
209 && m_textAlignLast == o.m_textAlignLast 207 && m_textAlignLast == o.m_textAlignLast
210 && m_textJustify == o.m_textJustify 208 && m_textJustify == o.m_textJustify
211 && m_textOrientation == o.m_textOrientation 209 && m_textOrientation == o.m_textOrientation
212 && m_textCombine == o.m_textCombine 210 && m_textCombine == o.m_textCombine
213 && m_textIndentLine == o.m_textIndentLine 211 && m_textIndentLine == o.m_textIndentLine
214 && m_textIndentType == o.m_textIndentType 212 && m_textIndentType == o.m_textIndentType
215 && m_lineBoxContain == o.m_lineBoxContain
216 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents 213 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
217 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt tribute 214 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt tribute
218 && m_respectImageOrientation == o.m_respectImageOrientation 215 && m_respectImageOrientation == o.m_respectImageOrientation
219 && hyphenationString == o.hyphenationString 216 && hyphenationString == o.hyphenationString
220 && locale == o.locale 217 && locale == o.locale
221 && textEmphasisCustomMark == o.textEmphasisCustomMark 218 && textEmphasisCustomMark == o.textEmphasisCustomMark
222 && quotesDataEquivalent(o) 219 && quotesDataEquivalent(o)
223 && m_tabSize == o.m_tabSize 220 && m_tabSize == o.m_tabSize
224 && m_imageRendering == o.m_imageRendering 221 && m_imageRendering == o.m_imageRendering
225 && m_textUnderlinePosition == o.m_textUnderlinePosition 222 && m_textUnderlinePosition == o.m_textUnderlinePosition
226 && m_rubyPosition == o.m_rubyPosition 223 && m_rubyPosition == o.m_rubyPosition
227 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) 224 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
228 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations); 225 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
229 } 226 }
230 227
231 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 228 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
232 { 229 {
233 return dataEquivalent(textShadow.get(), o.textShadow.get()); 230 return dataEquivalent(textShadow.get(), o.textShadow.get());
234 } 231 }
235 232
236 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 233 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
237 { 234 {
238 return dataEquivalent(quotes, o.quotes); 235 return dataEquivalent(quotes, o.quotes);
239 } 236 }
240 237
241 } // namespace blink 238 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698