| 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 * Copyright (C) 2013 Opera Software ASA. All rights reserved. |
| 7 * | 8 * |
| 8 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 11 * License as published by the Free Software Foundation; either |
| 11 * version 2 of the License, or (at your option) any later version. | 12 * version 2 of the License, or (at your option) any later version. |
| 12 * | 13 * |
| 13 * This library is distributed in the hope that it will be useful, | 14 * This library is distributed in the hope that it will be useful, |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Library General Public License for more details. | 17 * Library General Public License for more details. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 29 #include "core/rendering/ClipPathOperation.h" | 30 #include "core/rendering/ClipPathOperation.h" |
| 30 #include "core/rendering/style/BasicShapes.h" | 31 #include "core/rendering/style/BasicShapes.h" |
| 31 #include "core/rendering/style/CounterDirectives.h" | 32 #include "core/rendering/style/CounterDirectives.h" |
| 32 #include "core/rendering/style/CursorData.h" | 33 #include "core/rendering/style/CursorData.h" |
| 33 #include "core/rendering/style/DataRef.h" | 34 #include "core/rendering/style/DataRef.h" |
| 34 #include "core/rendering/style/FillLayer.h" | 35 #include "core/rendering/style/FillLayer.h" |
| 35 #include "core/rendering/style/LineClampValue.h" | 36 #include "core/rendering/style/LineClampValue.h" |
| 36 #include "core/rendering/style/NinePieceImage.h" | 37 #include "core/rendering/style/NinePieceImage.h" |
| 37 #include "core/rendering/style/RenderStyleConstants.h" | 38 #include "core/rendering/style/RenderStyleConstants.h" |
| 38 #include "core/rendering/style/ShapeValue.h" | 39 #include "core/rendering/style/ShapeValue.h" |
| 40 #include "core/rendering/style/StyleNavigationData.h" |
| 39 #include "platform/LengthPoint.h" | 41 #include "platform/LengthPoint.h" |
| 40 #include "wtf/OwnPtr.h" | 42 #include "wtf/OwnPtr.h" |
| 41 #include "wtf/PassRefPtr.h" | 43 #include "wtf/PassRefPtr.h" |
| 42 #include "wtf/Vector.h" | 44 #include "wtf/Vector.h" |
| 43 | 45 |
| 44 namespace WebCore { | 46 namespace WebCore { |
| 45 | 47 |
| 46 class ContentData; | 48 class ContentData; |
| 47 class CSSAnimationDataList; | 49 class CSSAnimationDataList; |
| 48 class LengthSize; | 50 class LengthSize; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 79 ~StyleRareNonInheritedData(); | 81 ~StyleRareNonInheritedData(); |
| 80 | 82 |
| 81 bool operator==(const StyleRareNonInheritedData&) const; | 83 bool operator==(const StyleRareNonInheritedData&) const; |
| 82 bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this =
= o); } | 84 bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this =
= o); } |
| 83 | 85 |
| 84 bool contentDataEquivalent(const StyleRareNonInheritedData&) const; | 86 bool contentDataEquivalent(const StyleRareNonInheritedData&) const; |
| 85 bool counterDataEquivalent(const StyleRareNonInheritedData&) const; | 87 bool counterDataEquivalent(const StyleRareNonInheritedData&) const; |
| 86 bool shadowDataEquivalent(const StyleRareNonInheritedData&) const; | 88 bool shadowDataEquivalent(const StyleRareNonInheritedData&) const; |
| 87 bool reflectionDataEquivalent(const StyleRareNonInheritedData&) const; | 89 bool reflectionDataEquivalent(const StyleRareNonInheritedData&) const; |
| 88 bool animationDataEquivalent(const StyleRareNonInheritedData&) const; | 90 bool animationDataEquivalent(const StyleRareNonInheritedData&) const; |
| 91 bool navigationDataEquivalent(const StyleRareNonInheritedData&) const; |
| 89 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const; | 92 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const; |
| 90 bool hasFilters() const; | 93 bool hasFilters() const; |
| 91 bool hasOpacity() const { return opacity < 1; } | 94 bool hasOpacity() const { return opacity < 1; } |
| 92 | 95 |
| 93 float opacity; // Whether or not we're transparent. | 96 float opacity; // Whether or not we're transparent. |
| 94 | 97 |
| 95 float m_aspectRatioDenominator; | 98 float m_aspectRatioDenominator; |
| 96 float m_aspectRatioNumerator; | 99 float m_aspectRatioNumerator; |
| 97 | 100 |
| 98 float m_perspective; | 101 float m_perspective; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 120 RefPtr<ShadowList> m_boxShadow; | 123 RefPtr<ShadowList> m_boxShadow; |
| 121 | 124 |
| 122 RefPtr<StyleReflection> m_boxReflect; | 125 RefPtr<StyleReflection> m_boxReflect; |
| 123 | 126 |
| 124 OwnPtrWillBePersistent<CSSAnimationDataList> m_animations; | 127 OwnPtrWillBePersistent<CSSAnimationDataList> m_animations; |
| 125 OwnPtrWillBePersistent<CSSAnimationDataList> m_transitions; | 128 OwnPtrWillBePersistent<CSSAnimationDataList> m_transitions; |
| 126 | 129 |
| 127 FillLayer m_mask; | 130 FillLayer m_mask; |
| 128 NinePieceImage m_maskBoxImage; | 131 NinePieceImage m_maskBoxImage; |
| 129 | 132 |
| 133 OwnPtr<StyleNavigationData> m_navigation; |
| 134 |
| 130 LengthSize m_pageSize; | 135 LengthSize m_pageSize; |
| 131 | 136 |
| 132 RefPtr<ShapeValue> m_shapeOutside; | 137 RefPtr<ShapeValue> m_shapeOutside; |
| 133 Length m_shapeMargin; | 138 Length m_shapeMargin; |
| 134 float m_shapeImageThreshold; | 139 float m_shapeImageThreshold; |
| 135 | 140 |
| 136 RefPtr<ClipPathOperation> m_clipPath; | 141 RefPtr<ClipPathOperation> m_clipPath; |
| 137 | 142 |
| 138 StyleColor m_textDecorationColor; | 143 StyleColor m_textDecorationColor; |
| 139 StyleColor m_visitedLinkTextDecorationColor; | 144 StyleColor m_visitedLinkTextDecorationColor; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 unsigned m_scrollBehavior: 2; | 198 unsigned m_scrollBehavior: 2; |
| 194 | 199 |
| 195 private: | 200 private: |
| 196 StyleRareNonInheritedData(); | 201 StyleRareNonInheritedData(); |
| 197 StyleRareNonInheritedData(const StyleRareNonInheritedData&); | 202 StyleRareNonInheritedData(const StyleRareNonInheritedData&); |
| 198 }; | 203 }; |
| 199 | 204 |
| 200 } // namespace WebCore | 205 } // namespace WebCore |
| 201 | 206 |
| 202 #endif // StyleRareNonInheritedData_h | 207 #endif // StyleRareNonInheritedData_h |
| OLD | NEW |