Trial: build trunk with Oilpan everywhere.

third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp

Index: third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
index de14f7a56637d737bf52b3e482ddc5cb745a6008..20d4eff7956fd4b0db205df29200790b48af3851 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
@@ -158,9 +158,35 @@ bool CSSPrimitiveValue::colorIsDerivedFromElement() const
 }
 
 using CSSTextCache = WillBePersistentHeapHashMap<RawPtrWillBeWeakMember<const CSSPrimitiveValue>, String>;
+
+#if defined(LEAK_SANITIZER)
+
+namespace {
+// With LSan, wrap the persistent cache so that the registration of the
+// (per-thread) static reference can be done.
+class CSSTextCacheWrapper {
+public:
+    CSSTextCacheWrapper()
+    {
+#if ENABLE(OILPAN)
+        m_cache.registerAsStaticReference();
+#endif
+    }
+
+    operator CSSTextCache&() { return m_cache; }
+
+private:
+    CSSTextCache m_cache;
+};
+
+}
+#else
+using CSSTextCacheWrapper = CSSTextCache;
+#endif
+
 static CSSTextCache& cssTextCache()
 {
-    AtomicallyInitializedStaticReference(ThreadSpecific<CSSTextCache>, cache, new ThreadSpecific<CSSTextCache>());
+    AtomicallyInitializedStaticReference(ThreadSpecific<CSSTextCacheWrapper>, cache, new ThreadSpecific<CSSTextCacheWrapper>);
     return *cache;
 }