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

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

Issue 16339006: Make sure to use CSSValueID and CSSPropertyID rather than integers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/CSSValuePool.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 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef CSSValuePool_h 26 #ifndef CSSValuePool_h
27 #define CSSValuePool_h 27 #define CSSValuePool_h
28 28
29 #include "CSSPropertyNames.h"
29 #include "CSSValueKeywords.h" 30 #include "CSSValueKeywords.h"
30 #include "core/css/CSSInheritedValue.h" 31 #include "core/css/CSSInheritedValue.h"
31 #include "core/css/CSSInitialValue.h" 32 #include "core/css/CSSInitialValue.h"
32 #include "core/css/CSSPrimitiveValue.h" 33 #include "core/css/CSSPrimitiveValue.h"
33 #include <wtf/HashMap.h> 34 #include "wtf/HashMap.h"
34 #include <wtf/RefPtr.h> 35 #include "wtf/RefPtr.h"
35 #include <wtf/text/AtomicStringHash.h> 36 #include "wtf/text/AtomicStringHash.h"
36 37
37 namespace WebCore { 38 namespace WebCore {
38 39
39 class CSSValueList; 40 class CSSValueList;
40 41
41 class CSSValuePool { 42 class CSSValuePool {
42 WTF_MAKE_FAST_ALLOCATED; 43 WTF_MAKE_FAST_ALLOCATED;
43 public: 44 public:
44 PassRefPtr<CSSValueList> createFontFaceValue(const AtomicString&); 45 PassRefPtr<CSSValueList> createFontFaceValue(const AtomicString&);
45 PassRefPtr<CSSPrimitiveValue> createFontFamilyValue(const String&); 46 PassRefPtr<CSSPrimitiveValue> createFontFamilyValue(const String&);
46 PassRefPtr<CSSInheritedValue> createInheritedValue() { return m_inheritedVal ue; } 47 PassRefPtr<CSSInheritedValue> createInheritedValue() { return m_inheritedVal ue; }
47 PassRefPtr<CSSInitialValue> createImplicitInitialValue() { return m_implicit InitialValue; } 48 PassRefPtr<CSSInitialValue> createImplicitInitialValue() { return m_implicit InitialValue; }
48 PassRefPtr<CSSInitialValue> createExplicitInitialValue() { return m_explicit InitialValue; } 49 PassRefPtr<CSSInitialValue> createExplicitInitialValue() { return m_explicit InitialValue; }
49 PassRefPtr<CSSPrimitiveValue> createIdentifierValue(int identifier); 50 PassRefPtr<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier);
51 PassRefPtr<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier );
50 PassRefPtr<CSSPrimitiveValue> createColorValue(unsigned rgbValue); 52 PassRefPtr<CSSPrimitiveValue> createColorValue(unsigned rgbValue);
51 PassRefPtr<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::U nitTypes); 53 PassRefPtr<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::U nitTypes);
52 PassRefPtr<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveV alue::UnitTypes type) { return CSSPrimitiveValue::create(value, type); } 54 PassRefPtr<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveV alue::UnitTypes type) { return CSSPrimitiveValue::create(value, type); }
53 template<typename T> static PassRefPtr<CSSPrimitiveValue> createValue(T valu e) { return CSSPrimitiveValue::create(value); } 55 template<typename T> static PassRefPtr<CSSPrimitiveValue> createValue(T valu e) { return CSSPrimitiveValue::create(value); }
54 56
55 void drain(); 57 void drain();
56 58
57 private: 59 private:
58 CSSValuePool(); 60 CSSValuePool();
59 61
(...skipping 22 matching lines...) Expand all
82 FontFamilyValueCache m_fontFamilyValueCache; 84 FontFamilyValueCache m_fontFamilyValueCache;
83 85
84 friend CSSValuePool& cssValuePool(); 86 friend CSSValuePool& cssValuePool();
85 }; 87 };
86 88
87 CSSValuePool& cssValuePool(); 89 CSSValuePool& cssValuePool();
88 90
89 } 91 }
90 92
91 #endif 93 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/CSSValuePool.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698