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

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

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 * 22 *
23 */ 23 */
24 24
25 #ifndef StyleRareNonInheritedData_h 25 #ifndef StyleRareNonInheritedData_h
26 #define StyleRareNonInheritedData_h 26 #define StyleRareNonInheritedData_h
27 27
28 #include "core/css/StyleColor.h"
28 #include "core/rendering/ClipPathOperation.h" 29 #include "core/rendering/ClipPathOperation.h"
29 #include "core/rendering/style/BasicShapes.h" 30 #include "core/rendering/style/BasicShapes.h"
30 #include "core/rendering/style/CounterDirectives.h" 31 #include "core/rendering/style/CounterDirectives.h"
31 #include "core/rendering/style/CursorData.h" 32 #include "core/rendering/style/CursorData.h"
32 #include "core/rendering/style/DataRef.h" 33 #include "core/rendering/style/DataRef.h"
33 #include "core/rendering/style/FillLayer.h" 34 #include "core/rendering/style/FillLayer.h"
34 #include "core/rendering/style/LineClampValue.h" 35 #include "core/rendering/style/LineClampValue.h"
35 #include "core/rendering/style/NinePieceImage.h" 36 #include "core/rendering/style/NinePieceImage.h"
36 #include "core/rendering/style/ShapeValue.h" 37 #include "core/rendering/style/ShapeValue.h"
37 #include "wtf/OwnPtr.h" 38 #include "wtf/OwnPtr.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 124
124 LengthSize m_pageSize; 125 LengthSize m_pageSize;
125 126
126 RefPtr<ShapeValue> m_shapeInside; 127 RefPtr<ShapeValue> m_shapeInside;
127 RefPtr<ShapeValue> m_shapeOutside; 128 RefPtr<ShapeValue> m_shapeOutside;
128 Length m_shapeMargin; 129 Length m_shapeMargin;
129 Length m_shapePadding; 130 Length m_shapePadding;
130 131
131 RefPtr<ClipPathOperation> m_clipPath; 132 RefPtr<ClipPathOperation> m_clipPath;
132 133
133 Color m_textDecorationColor; 134 StyleColor m_textDecorationColor;
134 Color m_visitedLinkTextDecorationColor; 135 StyleColor m_visitedLinkTextDecorationColor;
135 Color m_visitedLinkBackgroundColor; 136 StyleColor m_visitedLinkBackgroundColor;
136 Color m_visitedLinkOutlineColor; 137 StyleColor m_visitedLinkOutlineColor;
137 Color m_visitedLinkBorderLeftColor; 138 StyleColor m_visitedLinkBorderLeftColor;
138 Color m_visitedLinkBorderRightColor; 139 StyleColor m_visitedLinkBorderRightColor;
139 Color m_visitedLinkBorderTopColor; 140 StyleColor m_visitedLinkBorderTopColor;
140 Color m_visitedLinkBorderBottomColor; 141 StyleColor m_visitedLinkBorderBottomColor;
141 142
142 int m_order; 143 int m_order;
143 144
144 AtomicString m_flowThread; 145 AtomicString m_flowThread;
145 AtomicString m_regionThread; 146 AtomicString m_regionThread;
146 unsigned m_regionFragment : 1; // RegionFragment 147 unsigned m_regionFragment : 1; // RegionFragment
147 148
148 unsigned m_regionBreakAfter : 2; // EPageBreak 149 unsigned m_regionBreakAfter : 2; // EPageBreak
149 unsigned m_regionBreakBefore : 2; // EPageBreak 150 unsigned m_regionBreakBefore : 2; // EPageBreak
150 unsigned m_regionBreakInside : 2; // EPageBreak 151 unsigned m_regionBreakInside : 2; // EPageBreak
(...skipping 28 matching lines...) Expand all
179 unsigned m_touchAction : 1; // TouchAction 180 unsigned m_touchAction : 1; // TouchAction
180 181
181 private: 182 private:
182 StyleRareNonInheritedData(); 183 StyleRareNonInheritedData();
183 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 184 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
184 }; 185 };
185 186
186 } // namespace WebCore 187 } // namespace WebCore
187 188
188 #endif // StyleRareNonInheritedData_h 189 #endif // StyleRareNonInheritedData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698