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

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

Issue 1303153003: Change Counter to be a CSSValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase & removed dependent patchsets Created 5 years, 4 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 | « Source/core/css/CSSCalculationValue.cpp ('k') | 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 Counter_h 21 #ifndef CSSCounterValue_h
22 #define Counter_h 22 #define CSSCounterValue_h
23 23
24 #include "core/css/CSSPrimitiveValue.h" 24 #include "core/css/CSSPrimitiveValue.h"
25 #include "core/css/CSSValue.h"
25 #include "wtf/text/WTFString.h" 26 #include "wtf/text/WTFString.h"
26 27
27 namespace blink { 28 namespace blink {
28 29
29 class Counter : public RefCountedWillBeGarbageCollected<Counter> { 30 class CSSCounterValue : public CSSValue {
30 public: 31 public:
31 static PassRefPtrWillBeRawPtr<Counter> create(PassRefPtrWillBeRawPtr<CSSPrim itiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, Pas sRefPtrWillBeRawPtr<CSSPrimitiveValue> separator) 32 static PassRefPtrWillBeRawPtr<CSSCounterValue> create(PassRefPtrWillBeRawPtr <CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listSt yle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator)
32 { 33 {
33 return adoptRefWillBeNoop(new Counter(identifier, listStyle, separator)) ; 34 return adoptRefWillBeNoop(new CSSCounterValue(identifier, listStyle, sep arator));
34 } 35 }
35 36
36 String identifier() const { return m_identifier ? m_identifier->getStringVal ue() : String(); } 37 String identifier() const { return m_identifier ? m_identifier->getStringVal ue() : String(); }
37 String listStyle() const { return m_listStyle ? m_listStyle->getStringValue( ) : String(); } 38 String listStyle() const { return m_listStyle ? m_listStyle->getStringValue( ) : String(); }
38 String separator() const { return m_separator ? m_separator->getStringValue( ) : String(); } 39 String separator() const { return m_separator ? m_separator->getStringValue( ) : String(); }
39 40
40 CSSValueID listStyleIdent() const { return m_listStyle ? m_listStyle->getVal ueID() : CSSValueInvalid; } 41 CSSValueID listStyleIdent() const { return m_listStyle ? m_listStyle->getVal ueID() : CSSValueInvalid; }
41 42
42 void setIdentifier(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier) { m _identifier = identifier; } 43 bool equals(const CSSCounterValue& other) const
43 void setListStyle(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle) { m_l istStyle = listStyle; }
44 void setSeparator(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator) { m_s eparator = separator; }
45
46 bool equals(const Counter& other) const
47 { 44 {
48 return identifier() == other.identifier() 45 return identifier() == other.identifier()
49 && listStyle() == other.listStyle() 46 && listStyle() == other.listStyle()
50 && separator() == other.separator(); 47 && separator() == other.separator();
51 } 48 }
52 49
53 DECLARE_TRACE(); 50 String customCSSText() const;
51
52 DECLARE_TRACE_AFTER_DISPATCH();
54 53
55 private: 54 private:
56 Counter(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWill BeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator) 55 CSSCounterValue(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRe fPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimiti veValue> separator)
57 : m_identifier(identifier) 56 : CSSValue(CounterClass)
57 , m_identifier(identifier)
58 , m_listStyle(listStyle) 58 , m_listStyle(listStyle)
59 , m_separator(separator) { } 59 , m_separator(separator) { }
60 60
61 RefPtrWillBeMember<CSSPrimitiveValue> m_identifier; // string 61 RefPtrWillBeMember<CSSPrimitiveValue> m_identifier; // string
62 RefPtrWillBeMember<CSSPrimitiveValue> m_listStyle; // ident 62 RefPtrWillBeMember<CSSPrimitiveValue> m_listStyle; // ident
63 RefPtrWillBeMember<CSSPrimitiveValue> m_separator; // string 63 RefPtrWillBeMember<CSSPrimitiveValue> m_separator; // string
64 }; 64 };
65 65
66 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCounterValue, isCounterValue());
67
66 } // namespace blink 68 } // namespace blink
67 69
68 #endif // Counter_h 70 #endif // CSSCounterValue_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSCalculationValue.cpp ('k') | Source/core/css/CSSCounterValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698