| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 ~StyleRareInheritedData(); | 53 ~StyleRareInheritedData(); |
| 54 | 54 |
| 55 bool operator==(const StyleRareInheritedData& o) const; | 55 bool operator==(const StyleRareInheritedData& o) const; |
| 56 bool operator!=(const StyleRareInheritedData& o) const | 56 bool operator!=(const StyleRareInheritedData& o) const |
| 57 { | 57 { |
| 58 return !(*this == o); | 58 return !(*this == o); |
| 59 } | 59 } |
| 60 bool shadowDataEquivalent(const StyleRareInheritedData&) const; | 60 bool shadowDataEquivalent(const StyleRareInheritedData&) const; |
| 61 bool quotesDataEquivalent(const StyleRareInheritedData&) const; | 61 bool quotesDataEquivalent(const StyleRareInheritedData&) const; |
| 62 | 62 |
| 63 RefPtr<StyleImage> listStyleImage; | |
| 64 | |
| 65 StyleColor textStrokeColor() const { return m_textStrokeColorIsCurrentColor
? StyleColor::currentColor() : StyleColor(m_textStrokeColor); } | 63 StyleColor textStrokeColor() const { return m_textStrokeColorIsCurrentColor
? StyleColor::currentColor() : StyleColor(m_textStrokeColor); } |
| 66 StyleColor textFillColor() const { return m_textFillColorIsCurrentColor ? St
yleColor::currentColor() : StyleColor(m_textFillColor); } | 64 StyleColor textFillColor() const { return m_textFillColorIsCurrentColor ? St
yleColor::currentColor() : StyleColor(m_textFillColor); } |
| 67 StyleColor textEmphasisColor() const { return m_textEmphasisColorIsCurrentCo
lor ? StyleColor::currentColor() : StyleColor(m_textEmphasisColor); } | 65 StyleColor textEmphasisColor() const { return m_textEmphasisColorIsCurrentCo
lor ? StyleColor::currentColor() : StyleColor(m_textEmphasisColor); } |
| 68 | 66 |
| 69 void setTextStrokeColor(const StyleColor& color) { m_textStrokeColor = color
.resolve(Color()); m_textStrokeColorIsCurrentColor = color.isCurrentColor(); } | 67 void setTextStrokeColor(const StyleColor& color) { m_textStrokeColor = color
.resolve(Color()); m_textStrokeColorIsCurrentColor = color.isCurrentColor(); } |
| 70 void setTextFillColor(const StyleColor& color) { m_textFillColor = color.res
olve(Color()); m_textFillColorIsCurrentColor = color.isCurrentColor(); } | 68 void setTextFillColor(const StyleColor& color) { m_textFillColor = color.res
olve(Color()); m_textFillColorIsCurrentColor = color.isCurrentColor(); } |
| 71 void setTextEmphasisColor(const StyleColor& color) { m_textEmphasisColor = c
olor.resolve(Color()); m_textEmphasisColorIsCurrentColor = color.isCurrentColor(
); } | 69 void setTextEmphasisColor(const StyleColor& color) { m_textEmphasisColor = c
olor.resolve(Color()); m_textEmphasisColorIsCurrentColor = color.isCurrentColor(
); } |
| 72 | 70 |
| 73 Color m_textStrokeColor; | 71 Color m_textStrokeColor; |
| 74 float textStrokeWidth; | 72 float textStrokeWidth; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 RefPtr<AppliedTextDecorationList> appliedTextDecorations; | 130 RefPtr<AppliedTextDecorationList> appliedTextDecorations; |
| 133 | 131 |
| 134 private: | 132 private: |
| 135 StyleRareInheritedData(); | 133 StyleRareInheritedData(); |
| 136 StyleRareInheritedData(const StyleRareInheritedData&); | 134 StyleRareInheritedData(const StyleRareInheritedData&); |
| 137 }; | 135 }; |
| 138 | 136 |
| 139 } // namespace blink | 137 } // namespace blink |
| 140 | 138 |
| 141 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_STYLERAREINHERITEDDATA_H_ | 139 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_STYLERAREINHERITEDDATA_H_ |
| OLD | NEW |