Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSValuePool.cpp

diff --git a/src/third_party/WebKit/Source/core/css/CSSValuePool.cpp b/src/third_party/WebKit/Source/core/css/CSSValuePool.cpp
index 3d914d3..b5d161b 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSValuePool.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSValuePool.cpp
@@ -30,17 +30,12 @@
 #include "core/css/CSSValueList.h"
 #include "core/rendering/style/RenderStyle.h"
 
-namespace WebCore {
+namespace blink {
 
 CSSValuePool& cssValuePool()
 {
-#if ENABLE(OILPAN)
-    DEFINE_STATIC_LOCAL(Persistent<CSSValuePool>, pool, (new CSSValuePool()));
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSValuePool>, pool, (adoptPtrWillBeNoop(new CSSValuePool())));
     return *pool;
-#else
-    DEFINE_STATIC_LOCAL(CSSValuePool, pool, ());
-    return pool;
-#endif // ENABLE(OILPAN)
 }
 
 CSSValuePool::CSSValuePool()
@@ -153,6 +148,7 @@ PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const Ato
 
 void CSSValuePool::trace(Visitor* visitor)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_inheritedValue);
     visitor->trace(m_implicitInitialValue);
     visitor->trace(m_explicitInitialValue);
@@ -166,6 +162,7 @@ void CSSValuePool::trace(Visitor* visitor)
     visitor->trace(m_numberValueCache);
     visitor->trace(m_fontFaceValueCache);
     visitor->trace(m_fontFamilyValueCache);
+#endif
 }
 
 }