| OLD | NEW |
| 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 | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
| 4 * reserved. | 4 * reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 textEmphasisCustomMark(o.textEmphasisCustomMark), | 167 textEmphasisCustomMark(o.textEmphasisCustomMark), |
| 168 tapHighlightColor(o.tapHighlightColor), | 168 tapHighlightColor(o.tapHighlightColor), |
| 169 appliedTextDecorations(o.appliedTextDecorations), | 169 appliedTextDecorations(o.appliedTextDecorations), |
| 170 m_tabSize(o.m_tabSize), | 170 m_tabSize(o.m_tabSize), |
| 171 variables(o.variables), | 171 variables(o.variables), |
| 172 m_textSizeAdjust(o.m_textSizeAdjust) {} | 172 m_textSizeAdjust(o.m_textSizeAdjust) {} |
| 173 | 173 |
| 174 StyleRareInheritedData::~StyleRareInheritedData() {} | 174 StyleRareInheritedData::~StyleRareInheritedData() {} |
| 175 | 175 |
| 176 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const { | 176 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const { |
| 177 return compareEqualVariables(o) && compareEqualNonVariables(o); |
| 178 } |
| 179 |
| 180 bool StyleRareInheritedData::compareEqualNonVariables( |
| 181 const StyleRareInheritedData& o) const { |
| 177 return m_textStrokeColor == o.m_textStrokeColor && | 182 return m_textStrokeColor == o.m_textStrokeColor && |
| 178 textStrokeWidth == o.textStrokeWidth && | 183 textStrokeWidth == o.textStrokeWidth && |
| 179 m_textFillColor == o.m_textFillColor && | 184 m_textFillColor == o.m_textFillColor && |
| 180 m_textEmphasisColor == o.m_textEmphasisColor && | 185 m_textEmphasisColor == o.m_textEmphasisColor && |
| 181 m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor && | 186 m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor && |
| 182 m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor && | 187 m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor && |
| 183 m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor && | 188 m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor && |
| 184 tapHighlightColor == o.tapHighlightColor && shadowDataEquivalent(o) && | 189 tapHighlightColor == o.tapHighlightColor && shadowDataEquivalent(o) && |
| 185 highlight == o.highlight && | 190 highlight == o.highlight && |
| 186 dataEquivalent(cursorData.get(), o.cursorData.get()) && | 191 dataEquivalent(cursorData.get(), o.cursorData.get()) && |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 hyphenationString == o.hyphenationString && | 225 hyphenationString == o.hyphenationString && |
| 221 m_snapHeightUnit == o.m_snapHeightUnit && | 226 m_snapHeightUnit == o.m_snapHeightUnit && |
| 222 textEmphasisCustomMark == o.textEmphasisCustomMark && | 227 textEmphasisCustomMark == o.textEmphasisCustomMark && |
| 223 quotesDataEquivalent(o) && m_tabSize == o.m_tabSize && | 228 quotesDataEquivalent(o) && m_tabSize == o.m_tabSize && |
| 224 m_imageRendering == o.m_imageRendering && | 229 m_imageRendering == o.m_imageRendering && |
| 225 m_textUnderlinePosition == o.m_textUnderlinePosition && | 230 m_textUnderlinePosition == o.m_textUnderlinePosition && |
| 226 m_textDecorationSkip == o.m_textDecorationSkip && | 231 m_textDecorationSkip == o.m_textDecorationSkip && |
| 227 m_rubyPosition == o.m_rubyPosition && | 232 m_rubyPosition == o.m_rubyPosition && |
| 228 dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) && | 233 dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) && |
| 229 dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) && | 234 dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) && |
| 230 dataEquivalent(variables, o.variables) && | |
| 231 m_textSizeAdjust == o.m_textSizeAdjust; | 235 m_textSizeAdjust == o.m_textSizeAdjust; |
| 232 } | 236 } |
| 233 | 237 |
| 238 bool StyleRareInheritedData::compareEqualVariables( |
| 239 const StyleRareInheritedData& o) const { |
| 240 return dataEquivalent(variables, o.variables); |
| 241 } |
| 242 |
| 234 bool StyleRareInheritedData::shadowDataEquivalent( | 243 bool StyleRareInheritedData::shadowDataEquivalent( |
| 235 const StyleRareInheritedData& o) const { | 244 const StyleRareInheritedData& o) const { |
| 236 return dataEquivalent(textShadow.get(), o.textShadow.get()); | 245 return dataEquivalent(textShadow.get(), o.textShadow.get()); |
| 237 } | 246 } |
| 238 | 247 |
| 239 bool StyleRareInheritedData::quotesDataEquivalent( | 248 bool StyleRareInheritedData::quotesDataEquivalent( |
| 240 const StyleRareInheritedData& o) const { | 249 const StyleRareInheritedData& o) const { |
| 241 return dataEquivalent(quotes, o.quotes); | 250 return dataEquivalent(quotes, o.quotes); |
| 242 } | 251 } |
| 243 | 252 |
| 244 } // namespace blink | 253 } // namespace blink |
| OLD | NEW |