| OLD | NEW |
| 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, 2007, 2008, 2012 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv
ed. |
| 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, |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 case CSSValueWebkitLink: | 151 case CSSValueWebkitLink: |
| 152 case CSSValueWebkitActivelink: | 152 case CSSValueWebkitActivelink: |
| 153 case CSSValueCurrentcolor: | 153 case CSSValueCurrentcolor: |
| 154 return true; | 154 return true; |
| 155 default: | 155 default: |
| 156 return false; | 156 return false; |
| 157 } | 157 } |
| 158 } | 158 } |
| 159 | 159 |
| 160 using CSSTextCache = WillBePersistentHeapHashMap<RawPtrWillBeWeakMember<const CS
SPrimitiveValue>, String>; | 160 using CSSTextCache = WillBePersistentHeapHashMap<RawPtrWillBeWeakMember<const CS
SPrimitiveValue>, String>; |
| 161 |
| 162 #if defined(LEAK_SANITIZER) |
| 163 |
| 164 namespace { |
| 165 // With LSan, wrap the persistent cache so that the registration of the |
| 166 // (per-thread) static reference can be done. |
| 167 class CSSTextCacheWrapper { |
| 168 public: |
| 169 CSSTextCacheWrapper() |
| 170 { |
| 171 #if ENABLE(OILPAN) |
| 172 m_cache.registerAsStaticReference(); |
| 173 #endif |
| 174 } |
| 175 |
| 176 operator CSSTextCache&() { return m_cache; } |
| 177 |
| 178 private: |
| 179 CSSTextCache m_cache; |
| 180 }; |
| 181 |
| 182 } |
| 183 #else |
| 184 using CSSTextCacheWrapper = CSSTextCache; |
| 185 #endif |
| 186 |
| 161 static CSSTextCache& cssTextCache() | 187 static CSSTextCache& cssTextCache() |
| 162 { | 188 { |
| 163 AtomicallyInitializedStaticReference(ThreadSpecific<CSSTextCache>, cache, ne
w ThreadSpecific<CSSTextCache>()); | 189 AtomicallyInitializedStaticReference(ThreadSpecific<CSSTextCacheWrapper>, ca
che, new ThreadSpecific<CSSTextCacheWrapper>); |
| 164 return *cache; | 190 return *cache; |
| 165 } | 191 } |
| 166 | 192 |
| 167 CSSPrimitiveValue::UnitType CSSPrimitiveValue::typeWithCalcResolved() const | 193 CSSPrimitiveValue::UnitType CSSPrimitiveValue::typeWithCalcResolved() const |
| 168 { | 194 { |
| 169 if (type() != UnitType::Calc) | 195 if (type() != UnitType::Calc) |
| 170 return type(); | 196 return type(); |
| 171 | 197 |
| 172 switch (m_value.calc->category()) { | 198 switch (m_value.calc->category()) { |
| 173 case CalcAngle: | 199 case CalcAngle: |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 visitor->trace(m_value.calc); | 864 visitor->trace(m_value.calc); |
| 839 break; | 865 break; |
| 840 default: | 866 default: |
| 841 break; | 867 break; |
| 842 } | 868 } |
| 843 #endif | 869 #endif |
| 844 CSSValue::traceAfterDispatch(visitor); | 870 CSSValue::traceAfterDispatch(visitor); |
| 845 } | 871 } |
| 846 | 872 |
| 847 } // namespace blink | 873 } // namespace blink |
| OLD | NEW |