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

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

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 StyleMultiColData_h 25 #ifndef StyleMultiColData_h
26 #define StyleMultiColData_h 26 #define StyleMultiColData_h
27 27
28 #include "core/css/StyleColor.h"
29 #include "core/platform/Length.h" 28 #include "core/platform/Length.h"
30 #include "core/rendering/style/BorderValue.h" 29 #include "core/rendering/style/BorderValue.h"
31 #include "core/rendering/style/RenderStyleConstants.h" 30 #include "core/rendering/style/RenderStyleConstants.h"
32 #include "wtf/PassRefPtr.h" 31 #include "wtf/PassRefPtr.h"
33 #include "wtf/RefCounted.h" 32 #include "wtf/RefCounted.h"
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 // CSS3 Multi Column Layout 36 // CSS3 Multi Column Layout
38 37
(...skipping 12 matching lines...) Expand all
51 { 50 {
52 if (m_rule.style() == BNONE || m_rule.style() == BHIDDEN) 51 if (m_rule.style() == BNONE || m_rule.style() == BHIDDEN)
53 return 0; 52 return 0;
54 return m_rule.width(); 53 return m_rule.width();
55 } 54 }
56 55
57 float m_width; 56 float m_width;
58 unsigned short m_count; 57 unsigned short m_count;
59 float m_gap; 58 float m_gap;
60 BorderValue m_rule; 59 BorderValue m_rule;
61 StyleColor m_visitedLinkColumnRuleColor; 60 Color m_visitedLinkColumnRuleColor;
62 61
63 bool m_autoWidth : 1; 62 bool m_autoWidth : 1;
64 bool m_autoCount : 1; 63 bool m_autoCount : 1;
65 bool m_normalGap : 1; 64 bool m_normalGap : 1;
66 unsigned m_columnSpan : 1; 65 unsigned m_columnSpan : 1;
67 unsigned m_breakBefore : 2; // EPageBreak 66 unsigned m_breakBefore : 2; // EPageBreak
68 unsigned m_breakAfter : 2; // EPageBreak 67 unsigned m_breakAfter : 2; // EPageBreak
69 unsigned m_breakInside : 2; // EPageBreak 68 unsigned m_breakInside : 2; // EPageBreak
70 unsigned m_axis : 2; // ColumnAxis 69 unsigned m_axis : 2; // ColumnAxis
71 unsigned m_progression : 2; // ColumnProgression 70 unsigned m_progression : 2; // ColumnProgression
72 71
73 private: 72 private:
74 StyleMultiColData(); 73 StyleMultiColData();
75 StyleMultiColData(const StyleMultiColData&); 74 StyleMultiColData(const StyleMultiColData&);
76 }; 75 };
77 76
78 } // namespace WebCore 77 } // namespace WebCore
79 78
80 #endif // StyleMultiColData_h 79 #endif // StyleMultiColData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698