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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSCounterValue.h

Issue 1933713002: Store separator info of counters as CSSStringValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 4 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSCounterValue.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #ifndef CSSCounterValue_h 21 #ifndef CSSCounterValue_h
22 #define CSSCounterValue_h 22 #define CSSCounterValue_h
23 23
24 #include "core/css/CSSCustomIdentValue.h" 24 #include "core/css/CSSCustomIdentValue.h"
25 #include "core/css/CSSPrimitiveValue.h" 25 #include "core/css/CSSPrimitiveValue.h"
26 #include "core/css/CSSValue.h" 26 #include "core/css/CSSStringValue.h"
27 #include "wtf/text/WTFString.h" 27 #include "wtf/text/WTFString.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 class CSSCounterValue : public CSSValue { 31 class CSSCounterValue : public CSSValue {
32 public: 32 public:
33 static CSSCounterValue* create(CSSCustomIdentValue* identifier, CSSPrimitive Value* listStyle, CSSCustomIdentValue* separator) 33 static CSSCounterValue* create(CSSCustomIdentValue* identifier, CSSPrimitive Value* listStyle, CSSStringValue* separator)
34 { 34 {
35 return new CSSCounterValue(identifier, listStyle, separator); 35 return new CSSCounterValue(identifier, listStyle, separator);
36 } 36 }
37 37
38 String identifier() const { return m_identifier->value(); } 38 String identifier() const { return m_identifier->value(); }
39 CSSValueID listStyle() const { return m_listStyle->getValueID(); } 39 CSSValueID listStyle() const { return m_listStyle->getValueID(); }
40 String separator() const { return m_separator->value(); } 40 String separator() const { return m_separator->value(); }
41 41
42 bool equals(const CSSCounterValue& other) const 42 bool equals(const CSSCounterValue& other) const
43 { 43 {
44 return identifier() == other.identifier() 44 return identifier() == other.identifier()
45 && listStyle() == other.listStyle() 45 && listStyle() == other.listStyle()
46 && separator() == other.separator(); 46 && separator() == other.separator();
47 } 47 }
48 48
49 String customCSSText() const; 49 String customCSSText() const;
50 50
51 DECLARE_TRACE_AFTER_DISPATCH(); 51 DECLARE_TRACE_AFTER_DISPATCH();
52 52
53 private: 53 private:
54 CSSCounterValue(CSSCustomIdentValue* identifier, CSSPrimitiveValue* listStyl e, CSSCustomIdentValue* separator) 54 CSSCounterValue(CSSCustomIdentValue* identifier, CSSPrimitiveValue* listStyl e, CSSStringValue* separator)
55 : CSSValue(CounterClass) 55 : CSSValue(CounterClass)
56 , m_identifier(identifier) 56 , m_identifier(identifier)
57 , m_listStyle(listStyle) 57 , m_listStyle(listStyle)
58 , m_separator(separator) 58 , m_separator(separator)
59 { 59 {
60 ASSERT(m_listStyle->isValueID()); 60 ASSERT(m_listStyle->isValueID());
61 } 61 }
62 62
63 Member<CSSCustomIdentValue> m_identifier; // string 63 Member<CSSCustomIdentValue> m_identifier; // string
64 Member<CSSPrimitiveValue> m_listStyle; // ident 64 Member<CSSPrimitiveValue> m_listStyle; // ident
65 Member<CSSCustomIdentValue> m_separator; // string 65 Member<CSSStringValue> m_separator; // string
66 }; 66 };
67 67
68 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCounterValue, isCounterValue()); 68 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCounterValue, isCounterValue());
69 69
70 } // namespace blink 70 } // namespace blink
71 71
72 #endif // CSSCounterValue_h 72 #endif // CSSCounterValue_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSCounterValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698