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

Side by Side Diff: Source/core/rendering/style/StyleRareNonInheritedData.h

Issue 17450016: Implementation of CSS3 nav-up/down/left/right properties from CSS3 UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Applied code review suggestions. Also rebased. Created 6 years, 8 months 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 * Copyright (C) 2014 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
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
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
96 StyleNavigationValue navDown() const;
97 StyleNavigationValue navLeft() const;
98 StyleNavigationValue navRight() const;
99 StyleNavigationValue navUp() const;
100
101 void setNavDown(const StyleNavigationValue&);
102 void setNavLeft(const StyleNavigationValue&);
103 void setNavRight(const StyleNavigationValue&);
104 void setNavUp(const StyleNavigationValue&);
105
93 float opacity; // Whether or not we're transparent. 106 float opacity; // Whether or not we're transparent.
94 107
95 float m_aspectRatioDenominator; 108 float m_aspectRatioDenominator;
96 float m_aspectRatioNumerator; 109 float m_aspectRatioNumerator;
97 110
98 float m_perspective; 111 float m_perspective;
99 Length m_perspectiveOriginX; 112 Length m_perspectiveOriginX;
100 Length m_perspectiveOriginY; 113 Length m_perspectiveOriginY;
101 114
102 LineClampValue lineClamp; // An Apple extension. 115 LineClampValue lineClamp; // An Apple extension.
(...skipping 17 matching lines...) Expand all
120 RefPtr<ShadowList> m_boxShadow; 133 RefPtr<ShadowList> m_boxShadow;
121 134
122 RefPtr<StyleReflection> m_boxReflect; 135 RefPtr<StyleReflection> m_boxReflect;
123 136
124 OwnPtrWillBePersistent<CSSAnimationDataList> m_animations; 137 OwnPtrWillBePersistent<CSSAnimationDataList> m_animations;
125 OwnPtrWillBePersistent<CSSAnimationDataList> m_transitions; 138 OwnPtrWillBePersistent<CSSAnimationDataList> m_transitions;
126 139
127 FillLayer m_mask; 140 FillLayer m_mask;
128 NinePieceImage m_maskBoxImage; 141 NinePieceImage m_maskBoxImage;
129 142
143 OwnPtrWillBePersistent<StyleNavigationData> m_navigation;
144
130 LengthSize m_pageSize; 145 LengthSize m_pageSize;
131 146
132 RefPtr<ShapeValue> m_shapeOutside; 147 RefPtr<ShapeValue> m_shapeOutside;
133 Length m_shapeMargin; 148 Length m_shapeMargin;
134 float m_shapeImageThreshold; 149 float m_shapeImageThreshold;
135 150
136 RefPtr<ClipPathOperation> m_clipPath; 151 RefPtr<ClipPathOperation> m_clipPath;
137 152
138 StyleColor m_textDecorationColor; 153 StyleColor m_textDecorationColor;
139 StyleColor m_visitedLinkTextDecorationColor; 154 StyleColor m_visitedLinkTextDecorationColor;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 unsigned m_justifySelf : 4; // ItemPosition 208 unsigned m_justifySelf : 4; // ItemPosition
194 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment 209 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment
195 210
196 // ScrollBehavior. 'scroll-behavior' has 2 accepted values, but ScrollBehavi or has a third 211 // ScrollBehavior. 'scroll-behavior' has 2 accepted values, but ScrollBehavi or has a third
197 // value (that can only be specified using CSSOM scroll APIs) so 2 bits are needed. 212 // value (that can only be specified using CSSOM scroll APIs) so 2 bits are needed.
198 unsigned m_scrollBehavior: 2; 213 unsigned m_scrollBehavior: 2;
199 214
200 private: 215 private:
201 StyleRareNonInheritedData(); 216 StyleRareNonInheritedData();
202 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 217 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
218
219 void setNavigation(StyleNavigationData::NavigationDirection, const StyleNavi gationValue&);
203 }; 220 };
204 221
205 } // namespace WebCore 222 } // namespace WebCore
206 223
207 #endif // StyleRareNonInheritedData_h 224 #endif // StyleRareNonInheritedData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698