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: third_party/WebKit/Source/core/css/CSSValuePool.cpp

Issue 1373433002: Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_string
Patch Set: Created 5 years, 2 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
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 #include "config.h" 26 #include "config.h"
27 #include "core/css/CSSValuePool.h" 27 #include "core/css/CSSValuePool.h"
28 28
29 #include "core/css/CSSStringValueBase.h" 29 #include "core/css/CSSStringValues.h"
30 #include "core/css/CSSValueList.h" 30 #include "core/css/CSSValueList.h"
31 #include "core/css/parser/CSSParser.h" 31 #include "core/css/parser/CSSParser.h"
32 #include "core/style/ComputedStyle.h" 32 #include "core/style/ComputedStyle.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 CSSValuePool& cssValuePool() 36 CSSValuePool& cssValuePool()
37 { 37 {
38 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSValuePool>, pool, (adoptPtrWil lBeNoop(new CSSValuePool()))); 38 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSValuePool>, pool, (adoptPtrWil lBeNoop(new CSSValuePool())));
39 return *pool; 39 return *pool;
(...skipping 17 matching lines...) Expand all
57 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CS SValueID ident) 57 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CS SValueID ident)
58 { 58 {
59 if (ident <= 0) 59 if (ident <= 0)
60 return CSSPrimitiveValue::createIdentifier(ident); 60 return CSSPrimitiveValue::createIdentifier(ident);
61 61
62 if (!m_identifierValueCache[ident]) 62 if (!m_identifierValueCache[ident])
63 m_identifierValueCache[ident] = CSSPrimitiveValue::createIdentifier(iden t); 63 m_identifierValueCache[ident] = CSSPrimitiveValue::createIdentifier(iden t);
64 return m_identifierValueCache[ident]; 64 return m_identifierValueCache[ident];
65 } 65 }
66 66
67 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CS SPropertyID ident) 67 PassRefPtrWillBeRawPtr<CSSCustomIdentValue> CSSValuePool::createIdentifierValue( CSSPropertyID ident)
68 { 68 {
69 return CSSPrimitiveValue::createIdentifier(ident); 69 return CSSCustomIdentValue::create(ident);
70 } 70 }
71 71
72 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigne d rgbValue) 72 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigne d rgbValue)
73 { 73 {
74 // These are the empty and deleted values of the hash table. 74 // These are the empty and deleted values of the hash table.
75 if (rgbValue == Color::transparent) 75 if (rgbValue == Color::transparent)
76 return m_colorTransparent; 76 return m_colorTransparent;
77 if (rgbValue == Color::white) 77 if (rgbValue == Color::white)
78 return m_colorWhite; 78 return m_colorWhite;
79 // Just because it is common. 79 // Just because it is common.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 visitor->trace(m_colorBlack); 165 visitor->trace(m_colorBlack);
166 visitor->trace(m_pixelValueCache); 166 visitor->trace(m_pixelValueCache);
167 visitor->trace(m_percentValueCache); 167 visitor->trace(m_percentValueCache);
168 visitor->trace(m_numberValueCache); 168 visitor->trace(m_numberValueCache);
169 visitor->trace(m_fontFaceValueCache); 169 visitor->trace(m_fontFaceValueCache);
170 visitor->trace(m_fontFamilyValueCache); 170 visitor->trace(m_fontFamilyValueCache);
171 #endif 171 #endif
172 } 172 }
173 173
174 } 174 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698