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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.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 StyleRareInheritedData_h 25 #ifndef StyleRareInheritedData_h
26 #define StyleRareInheritedData_h 26 #define StyleRareInheritedData_h
27 27
28 #include "core/css/StyleColor.h"
28 #include "core/platform/Length.h" 29 #include "core/platform/Length.h"
29 #include "core/platform/graphics/Color.h"
30 #include <wtf/PassRefPtr.h> 30 #include <wtf/PassRefPtr.h>
31 #include <wtf/RefCounted.h> 31 #include <wtf/RefCounted.h>
32 #include <wtf/text/AtomicString.h> 32 #include <wtf/text/AtomicString.h>
33 33
34 #include "core/rendering/style/DataRef.h" 34 #include "core/rendering/style/DataRef.h"
35 #include "core/rendering/style/StyleVariableData.h" 35 #include "core/rendering/style/StyleVariableData.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 class CursorList; 39 class CursorList;
(...skipping 12 matching lines...) Expand all
52 52
53 bool operator==(const StyleRareInheritedData& o) const; 53 bool operator==(const StyleRareInheritedData& o) const;
54 bool operator!=(const StyleRareInheritedData& o) const 54 bool operator!=(const StyleRareInheritedData& o) const
55 { 55 {
56 return !(*this == o); 56 return !(*this == o);
57 } 57 }
58 bool shadowDataEquivalent(const StyleRareInheritedData&) const; 58 bool shadowDataEquivalent(const StyleRareInheritedData&) const;
59 59
60 RefPtr<StyleImage> listStyleImage; 60 RefPtr<StyleImage> listStyleImage;
61 61
62 Color textStrokeColor; 62 StyleColor textStrokeColor;
63 float textStrokeWidth; 63 float textStrokeWidth;
64 Color textFillColor; 64 StyleColor textFillColor;
65 Color textEmphasisColor; 65 StyleColor textEmphasisColor;
66 66
67 Color visitedLinkTextStrokeColor; 67 StyleColor visitedLinkTextStrokeColor;
68 Color visitedLinkTextFillColor; 68 StyleColor visitedLinkTextFillColor;
69 Color visitedLinkTextEmphasisColor; 69 StyleColor visitedLinkTextEmphasisColor;
70 70
71 OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed t ext drawing. 71 OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed t ext drawing.
72 AtomicString highlight; // Apple-specific extension for custom highlight ren dering. 72 AtomicString highlight; // Apple-specific extension for custom highlight ren dering.
73 73
74 RefPtr<CursorList> cursorData; 74 RefPtr<CursorList> cursorData;
75 Length indent; 75 Length indent;
76 float m_effectiveZoom; 76 float m_effectiveZoom;
77 77
78 // Paged media properties. 78 // Paged media properties.
79 short widows; 79 short widows;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 short hyphenationLimitLines; 114 short hyphenationLimitLines;
115 115
116 AtomicString locale; 116 AtomicString locale;
117 117
118 AtomicString textEmphasisCustomMark; 118 AtomicString textEmphasisCustomMark;
119 RefPtr<QuotesData> quotes; 119 RefPtr<QuotesData> quotes;
120 120
121 AtomicString m_lineGrid; 121 AtomicString m_lineGrid;
122 unsigned m_tabSize; 122 unsigned m_tabSize;
123 123
124 Color tapHighlightColor; 124 StyleColor tapHighlightColor;
125 125
126 DataRef<StyleVariableData> m_variables; 126 DataRef<StyleVariableData> m_variables;
127 127
128 private: 128 private:
129 StyleRareInheritedData(); 129 StyleRareInheritedData();
130 StyleRareInheritedData(const StyleRareInheritedData&); 130 StyleRareInheritedData(const StyleRareInheritedData&);
131 }; 131 };
132 132
133 } // namespace WebCore 133 } // namespace WebCore
134 134
135 #endif // StyleRareInheritedData_h 135 #endif // StyleRareInheritedData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698