OLD | NEW |
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 |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 } | 121 } |
122 } | 122 } |
123 | 123 |
124 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length
& value, const ComputedStyle& style) | 124 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length
& value, const ComputedStyle& style) |
125 { | 125 { |
126 return CSSPrimitiveValue::create(value, style.effectiveZoom()); | 126 return CSSPrimitiveValue::create(value, style.effectiveZoom()); |
127 } | 127 } |
128 | 128 |
129 PassRefPtrWillBeRawPtr<CSSFontFamilyValue> CSSValuePool::createFontFamilyValue(c
onst String& familyName) | 129 PassRefPtrWillBeRawPtr<CSSFontFamilyValue> CSSValuePool::createFontFamilyValue(c
onst String& familyName) |
130 { | 130 { |
| 131 if (familyName.isNull()) |
| 132 return CSSFontFamilyValue::create(familyName); |
131 RefPtrWillBeMember<CSSFontFamilyValue>& value = m_fontFamilyValueCache.add(f
amilyName, nullptr).storedValue->value; | 133 RefPtrWillBeMember<CSSFontFamilyValue>& value = m_fontFamilyValueCache.add(f
amilyName, nullptr).storedValue->value; |
132 if (!value) | 134 if (!value) |
133 value = CSSFontFamilyValue::create(familyName); | 135 value = CSSFontFamilyValue::create(familyName); |
134 return value; | 136 return value; |
135 } | 137 } |
136 | 138 |
137 PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const Ato
micString& string) | 139 PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const Ato
micString& string) |
138 { | 140 { |
139 // Just wipe out the cache and start rebuilding if it gets too big. | 141 // Just wipe out the cache and start rebuilding if it gets too big. |
140 const unsigned maximumFontFaceCacheSize = 128; | 142 const unsigned maximumFontFaceCacheSize = 128; |
(...skipping 23 matching lines...) Expand all Loading... |
164 visitor->trace(m_colorBlack); | 166 visitor->trace(m_colorBlack); |
165 visitor->trace(m_pixelValueCache); | 167 visitor->trace(m_pixelValueCache); |
166 visitor->trace(m_percentValueCache); | 168 visitor->trace(m_percentValueCache); |
167 visitor->trace(m_numberValueCache); | 169 visitor->trace(m_numberValueCache); |
168 visitor->trace(m_fontFaceValueCache); | 170 visitor->trace(m_fontFaceValueCache); |
169 visitor->trace(m_fontFamilyValueCache); | 171 visitor->trace(m_fontFamilyValueCache); |
170 #endif | 172 #endif |
171 } | 173 } |
172 | 174 |
173 } // namespace blink | 175 } // namespace blink |
OLD | NEW |