| 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 
     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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68     , overflowWrap(RenderStyle::initialOverflowWrap()) | 68     , overflowWrap(RenderStyle::initialOverflowWrap()) | 
| 69     , lineBreak(LineBreakAuto) | 69     , lineBreak(LineBreakAuto) | 
| 70     , resize(RenderStyle::initialResize()) | 70     , resize(RenderStyle::initialResize()) | 
| 71     , userSelect(RenderStyle::initialUserSelect()) | 71     , userSelect(RenderStyle::initialUserSelect()) | 
| 72     , speak(SpeakNormal) | 72     , speak(SpeakNormal) | 
| 73     , hyphens(HyphensManual) | 73     , hyphens(HyphensManual) | 
| 74     , textEmphasisFill(TextEmphasisFillFilled) | 74     , textEmphasisFill(TextEmphasisFillFilled) | 
| 75     , textEmphasisMark(TextEmphasisMarkNone) | 75     , textEmphasisMark(TextEmphasisMarkNone) | 
| 76     , textEmphasisPosition(TextEmphasisPositionOver) | 76     , textEmphasisPosition(TextEmphasisPositionOver) | 
| 77     , m_textAlignLast(RenderStyle::initialTextAlignLast()) | 77     , m_textAlignLast(RenderStyle::initialTextAlignLast()) | 
|  | 78     , m_textJustify(RenderStyle::initialTextJustify()) | 
| 78     , m_textOrientation(TextOrientationVerticalRight) | 79     , m_textOrientation(TextOrientationVerticalRight) | 
| 79     , m_textIndentLine(RenderStyle::initialTextIndentLine()) | 80     , m_textIndentLine(RenderStyle::initialTextIndentLine()) | 
| 80     , m_lineBoxContain(RenderStyle::initialLineBoxContain()) | 81     , m_lineBoxContain(RenderStyle::initialLineBoxContain()) | 
| 81     , m_imageRendering(RenderStyle::initialImageRendering()) | 82     , m_imageRendering(RenderStyle::initialImageRendering()) | 
| 82     , m_lineSnap(RenderStyle::initialLineSnap()) | 83     , m_lineSnap(RenderStyle::initialLineSnap()) | 
| 83     , m_lineAlign(RenderStyle::initialLineAlign()) | 84     , m_lineAlign(RenderStyle::initialLineAlign()) | 
| 84 #if ENABLE(CSS3_TEXT) | 85 #if ENABLE(CSS3_TEXT) | 
| 85     , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) | 86     , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) | 
| 86 #endif // CSS3_TEXT | 87 #endif // CSS3_TEXT | 
| 87     , m_rubyPosition(RenderStyle::initialRubyPosition()) | 88     , m_rubyPosition(RenderStyle::initialRubyPosition()) | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 120     , overflowWrap(o.overflowWrap) | 121     , overflowWrap(o.overflowWrap) | 
| 121     , lineBreak(o.lineBreak) | 122     , lineBreak(o.lineBreak) | 
| 122     , resize(o.resize) | 123     , resize(o.resize) | 
| 123     , userSelect(o.userSelect) | 124     , userSelect(o.userSelect) | 
| 124     , speak(o.speak) | 125     , speak(o.speak) | 
| 125     , hyphens(o.hyphens) | 126     , hyphens(o.hyphens) | 
| 126     , textEmphasisFill(o.textEmphasisFill) | 127     , textEmphasisFill(o.textEmphasisFill) | 
| 127     , textEmphasisMark(o.textEmphasisMark) | 128     , textEmphasisMark(o.textEmphasisMark) | 
| 128     , textEmphasisPosition(o.textEmphasisPosition) | 129     , textEmphasisPosition(o.textEmphasisPosition) | 
| 129     , m_textAlignLast(o.m_textAlignLast) | 130     , m_textAlignLast(o.m_textAlignLast) | 
|  | 131     , m_textJustify(o.m_textJustify) | 
| 130     , m_textOrientation(o.m_textOrientation) | 132     , m_textOrientation(o.m_textOrientation) | 
| 131     , m_textIndentLine(o.m_textIndentLine) | 133     , m_textIndentLine(o.m_textIndentLine) | 
| 132     , m_lineBoxContain(o.m_lineBoxContain) | 134     , m_lineBoxContain(o.m_lineBoxContain) | 
| 133     , m_imageRendering(o.m_imageRendering) | 135     , m_imageRendering(o.m_imageRendering) | 
| 134     , m_lineSnap(o.m_lineSnap) | 136     , m_lineSnap(o.m_lineSnap) | 
| 135     , m_lineAlign(o.m_lineAlign) | 137     , m_lineAlign(o.m_lineAlign) | 
| 136 #if ENABLE(CSS3_TEXT) | 138 #if ENABLE(CSS3_TEXT) | 
| 137     , m_textUnderlinePosition(o.m_textUnderlinePosition) | 139     , m_textUnderlinePosition(o.m_textUnderlinePosition) | 
| 138 #endif // CSS3_TEXT | 140 #endif // CSS3_TEXT | 
| 139     , m_rubyPosition(o.m_rubyPosition) | 141     , m_rubyPosition(o.m_rubyPosition) | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 191         && userSelect == o.userSelect | 193         && userSelect == o.userSelect | 
| 192         && speak == o.speak | 194         && speak == o.speak | 
| 193         && hyphens == o.hyphens | 195         && hyphens == o.hyphens | 
| 194         && hyphenationLimitBefore == o.hyphenationLimitBefore | 196         && hyphenationLimitBefore == o.hyphenationLimitBefore | 
| 195         && hyphenationLimitAfter == o.hyphenationLimitAfter | 197         && hyphenationLimitAfter == o.hyphenationLimitAfter | 
| 196         && hyphenationLimitLines == o.hyphenationLimitLines | 198         && hyphenationLimitLines == o.hyphenationLimitLines | 
| 197         && textEmphasisFill == o.textEmphasisFill | 199         && textEmphasisFill == o.textEmphasisFill | 
| 198         && textEmphasisMark == o.textEmphasisMark | 200         && textEmphasisMark == o.textEmphasisMark | 
| 199         && textEmphasisPosition == o.textEmphasisPosition | 201         && textEmphasisPosition == o.textEmphasisPosition | 
| 200         && m_textAlignLast == o.m_textAlignLast | 202         && m_textAlignLast == o.m_textAlignLast | 
|  | 203         && m_textJustify == o.m_textJustify | 
| 201         && m_textOrientation == o.m_textOrientation | 204         && m_textOrientation == o.m_textOrientation | 
| 202         && m_textIndentLine == o.m_textIndentLine | 205         && m_textIndentLine == o.m_textIndentLine | 
| 203         && m_lineBoxContain == o.m_lineBoxContain | 206         && m_lineBoxContain == o.m_lineBoxContain | 
| 204         && hyphenationString == o.hyphenationString | 207         && hyphenationString == o.hyphenationString | 
| 205         && locale == o.locale | 208         && locale == o.locale | 
| 206         && textEmphasisCustomMark == o.textEmphasisCustomMark | 209         && textEmphasisCustomMark == o.textEmphasisCustomMark | 
| 207         && QuotesData::equals(quotes.get(), o.quotes.get()) | 210         && QuotesData::equals(quotes.get(), o.quotes.get()) | 
| 208         && m_tabSize == o.m_tabSize | 211         && m_tabSize == o.m_tabSize | 
| 209         && m_lineGrid == o.m_lineGrid | 212         && m_lineGrid == o.m_lineGrid | 
| 210         && m_imageRendering == o.m_imageRendering | 213         && m_imageRendering == o.m_imageRendering | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 221 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& 
     o) const | 224 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& 
     o) const | 
| 222 { | 225 { | 
| 223     if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) | 226     if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) | 
| 224         return false; | 227         return false; | 
| 225     if (textShadow && o.textShadow && (*textShadow != *o.textShadow)) | 228     if (textShadow && o.textShadow && (*textShadow != *o.textShadow)) | 
| 226         return false; | 229         return false; | 
| 227     return true; | 230     return true; | 
| 228 } | 231 } | 
| 229 | 232 | 
| 230 } // namespace WebCore | 233 } // namespace WebCore | 
| OLD | NEW | 
|---|