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

Side by Side Diff: sky/engine/core/rendering/style/StyleRareNonInheritedData.h

Issue 709213002: Remove ContentData. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
OLDNEW
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 25 matching lines...) Expand all
36 #include "core/rendering/style/NinePieceImage.h" 36 #include "core/rendering/style/NinePieceImage.h"
37 #include "core/rendering/style/RenderStyleConstants.h" 37 #include "core/rendering/style/RenderStyleConstants.h"
38 #include "core/rendering/style/ShapeValue.h" 38 #include "core/rendering/style/ShapeValue.h"
39 #include "platform/LengthPoint.h" 39 #include "platform/LengthPoint.h"
40 #include "wtf/OwnPtr.h" 40 #include "wtf/OwnPtr.h"
41 #include "wtf/PassRefPtr.h" 41 #include "wtf/PassRefPtr.h"
42 #include "wtf/Vector.h" 42 #include "wtf/Vector.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class ContentData;
47 class CSSAnimationData; 46 class CSSAnimationData;
48 class CSSTransitionData; 47 class CSSTransitionData;
49 class LengthSize; 48 class LengthSize;
50 class ShadowList; 49 class ShadowList;
51 class StyleFilterData; 50 class StyleFilterData;
52 class StyleFlexibleBoxData; 51 class StyleFlexibleBoxData;
53 class StyleTransformData; 52 class StyleTransformData;
54 class StyleWillChangeData; 53 class StyleWillChangeData;
55 54
56 // Page size type. 55 // Page size type.
(...skipping 11 matching lines...) Expand all
68 // actually uses one of these properties. 67 // actually uses one of these properties.
69 class StyleRareNonInheritedData : public RefCounted<StyleRareNonInheritedData> { 68 class StyleRareNonInheritedData : public RefCounted<StyleRareNonInheritedData> {
70 public: 69 public:
71 static PassRefPtr<StyleRareNonInheritedData> create() { return adoptRef(new StyleRareNonInheritedData); } 70 static PassRefPtr<StyleRareNonInheritedData> create() { return adoptRef(new StyleRareNonInheritedData); }
72 PassRefPtr<StyleRareNonInheritedData> copy() const { return adoptRef(new Sty leRareNonInheritedData(*this)); } 71 PassRefPtr<StyleRareNonInheritedData> copy() const { return adoptRef(new Sty leRareNonInheritedData(*this)); }
73 ~StyleRareNonInheritedData(); 72 ~StyleRareNonInheritedData();
74 73
75 bool operator==(const StyleRareNonInheritedData&) const; 74 bool operator==(const StyleRareNonInheritedData&) const;
76 bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this = = o); } 75 bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this = = o); }
77 76
78 bool contentDataEquivalent(const StyleRareNonInheritedData&) const;
79 bool counterDataEquivalent(const StyleRareNonInheritedData&) const; 77 bool counterDataEquivalent(const StyleRareNonInheritedData&) const;
80 bool shadowDataEquivalent(const StyleRareNonInheritedData&) const; 78 bool shadowDataEquivalent(const StyleRareNonInheritedData&) const;
81 bool animationDataEquivalent(const StyleRareNonInheritedData&) const; 79 bool animationDataEquivalent(const StyleRareNonInheritedData&) const;
82 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const; 80 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const;
83 bool hasFilters() const; 81 bool hasFilters() const;
84 bool hasOpacity() const { return opacity < 1; } 82 bool hasOpacity() const { return opacity < 1; }
85 83
86 float opacity; // Whether or not we're transparent. 84 float opacity; // Whether or not we're transparent.
87 85
88 float m_aspectRatioDenominator; 86 float m_aspectRatioDenominator;
89 float m_aspectRatioNumerator; 87 float m_aspectRatioNumerator;
90 88
91 float m_perspective; 89 float m_perspective;
92 Length m_perspectiveOriginX; 90 Length m_perspectiveOriginX;
93 Length m_perspectiveOriginY; 91 Length m_perspectiveOriginY;
94 92
95 LineClampValue lineClamp; // An Apple extension. 93 LineClampValue lineClamp; // An Apple extension.
96 94
97 DataRef<StyleFlexibleBoxData> m_flexibleBox; 95 DataRef<StyleFlexibleBoxData> m_flexibleBox;
98 DataRef<StyleTransformData> m_transform; // Transform properties (rotate, sc ale, skew, etc.) 96 DataRef<StyleTransformData> m_transform; // Transform properties (rotate, sc ale, skew, etc.)
99 DataRef<StyleWillChangeData> m_willChange; // CSS Will Change 97 DataRef<StyleWillChangeData> m_willChange; // CSS Will Change
100 98
101 DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, e tc.) 99 DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, e tc.)
102 100
103 OwnPtr<ContentData> m_content;
104 OwnPtr<CounterDirectiveMap> m_counterDirectives; 101 OwnPtr<CounterDirectiveMap> m_counterDirectives;
105 102
106 RefPtr<ShadowList> m_boxShadow; 103 RefPtr<ShadowList> m_boxShadow;
107 104
108 OwnPtr<CSSAnimationData> m_animations; 105 OwnPtr<CSSAnimationData> m_animations;
109 OwnPtr<CSSTransitionData> m_transitions; 106 OwnPtr<CSSTransitionData> m_transitions;
110 107
111 FillLayer m_mask; 108 FillLayer m_mask;
112 NinePieceImage m_maskBoxImage; 109 NinePieceImage m_maskBoxImage;
113 110
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 unsigned m_hasInlineTransform : 1; 176 unsigned m_hasInlineTransform : 1;
180 177
181 private: 178 private:
182 StyleRareNonInheritedData(); 179 StyleRareNonInheritedData();
183 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 180 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
184 }; 181 };
185 182
186 } // namespace blink 183 } // namespace blink
187 184
188 #endif // StyleRareNonInheritedData_h 185 #endif // StyleRareNonInheritedData_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.cpp ('k') | sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698