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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSValuePool.cpp

Issue 1778743003: Make <custom-ident> not insert quotes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also fix FontFace.cpp Created 4 years, 9 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 "core/css/CSSValuePool.h" 26 #include "core/css/CSSValuePool.h"
27 27
28 #include "core/css/CSSFontFamilyValue.h"
28 #include "core/css/CSSValueList.h" 29 #include "core/css/CSSValueList.h"
29 #include "core/css/parser/CSSParser.h" 30 #include "core/css/parser/CSSParser.h"
30 #include "core/style/ComputedStyle.h" 31 #include "core/style/ComputedStyle.h"
31 32
32 namespace blink { 33 namespace blink {
33 34
34 CSSValuePool& cssValuePool() 35 CSSValuePool& cssValuePool()
35 { 36 {
36 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSValuePool>, pool, (adoptPtrWil lBeNoop(new CSSValuePool()))); 37 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSValuePool>, pool, (adoptPtrWil lBeNoop(new CSSValuePool())));
37 return *pool; 38 return *pool;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 default: 120 default:
120 return CSSPrimitiveValue::create(value, type); 121 return CSSPrimitiveValue::create(value, type);
121 } 122 }
122 } 123 }
123 124
124 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length & value, const ComputedStyle& style) 125 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length & value, const ComputedStyle& style)
125 { 126 {
126 return CSSPrimitiveValue::create(value, style.effectiveZoom()); 127 return CSSPrimitiveValue::create(value, style.effectiveZoom());
127 } 128 }
128 129
129 PassRefPtrWillBeRawPtr<CSSCustomIdentValue> CSSValuePool::createFontFamilyValue( const String& familyName) 130 PassRefPtrWillBeRawPtr<CSSFontFamilyValue> CSSValuePool::createFontFamilyValue(c onst String& familyName)
130 { 131 {
131 RefPtrWillBeMember<CSSCustomIdentValue>& value = m_fontFamilyValueCache.add( familyName, nullptr).storedValue->value; 132 RefPtrWillBeMember<CSSFontFamilyValue>& value = m_fontFamilyValueCache.add(f amilyName, nullptr).storedValue->value;
132 if (!value) 133 if (!value)
133 value = CSSCustomIdentValue::create(familyName); 134 value = CSSFontFamilyValue::create(familyName);
134 return value; 135 return value;
135 } 136 }
136 137
137 PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const Ato micString& string) 138 PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const Ato micString& string)
138 { 139 {
139 // Just wipe out the cache and start rebuilding if it gets too big. 140 // Just wipe out the cache and start rebuilding if it gets too big.
140 const unsigned maximumFontFaceCacheSize = 128; 141 const unsigned maximumFontFaceCacheSize = 128;
141 if (m_fontFaceValueCache.size() > maximumFontFaceCacheSize) 142 if (m_fontFaceValueCache.size() > maximumFontFaceCacheSize)
142 m_fontFaceValueCache.clear(); 143 m_fontFaceValueCache.clear();
143 144
(...skipping 20 matching lines...) Expand all
164 visitor->trace(m_colorBlack); 165 visitor->trace(m_colorBlack);
165 visitor->trace(m_pixelValueCache); 166 visitor->trace(m_pixelValueCache);
166 visitor->trace(m_percentValueCache); 167 visitor->trace(m_percentValueCache);
167 visitor->trace(m_numberValueCache); 168 visitor->trace(m_numberValueCache);
168 visitor->trace(m_fontFaceValueCache); 169 visitor->trace(m_fontFaceValueCache);
169 visitor->trace(m_fontFamilyValueCache); 170 visitor->trace(m_fontFamilyValueCache);
170 #endif 171 #endif
171 } 172 }
172 173
173 } // namespace blink 174 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698