Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSImageGeneratorValue.cpp

Index: Source/core/css/CSSImageGeneratorValue.cpp
diff --git a/Source/core/css/CSSImageGeneratorValue.cpp b/Source/core/css/CSSImageGeneratorValue.cpp
index c8deda1faed2cadad8adcc538d8827c612dcb18c..c73673c47dde2f70af2be52141d470aec82e2930 100644
--- a/Source/core/css/CSSImageGeneratorValue.cpp
+++ b/Source/core/css/CSSImageGeneratorValue.cpp
@@ -45,14 +45,7 @@ CSSImageGeneratorValue::~CSSImageGeneratorValue()
 void CSSImageGeneratorValue::addClient(LayoutObject* layoutObject, const IntSize& size)
 {
     ASSERT(layoutObject);
-#if !ENABLE(OILPAN)
     ref();
-#else
-    if (m_clients.isEmpty()) {
-        ASSERT(!m_keepAlive);
-        m_keepAlive = this;
-    }
-#endif
 
     if (!size.isEmpty())
         m_sizes.add(size);
@@ -84,14 +77,7 @@ void CSSImageGeneratorValue::removeClient(LayoutObject* layoutObject)
     if (!--sizeCount.count)
         m_clients.remove(layoutObject);
 
-#if !ENABLE(OILPAN)
     deref();
-#else
-    if (m_clients.isEmpty()) {
-        ASSERT(m_keepAlive);
-        m_keepAlive.clear();
-    }
-#endif
 }
 
 Image* CSSImageGeneratorValue::getImage(LayoutObject* layoutObject, const IntSize& size)
@@ -101,7 +87,7 @@ Image* CSSImageGeneratorValue::getImage(LayoutObject* layoutObject, const IntSiz
         SizeAndCount& sizeCount = it->value;
         IntSize oldSize = sizeCount.size;
         if (oldSize != size) {
-            RefPtrWillBeRawPtr<CSSImageGeneratorValue> protect(this);
+            RefPtr<CSSImageGeneratorValue> protect(this);
             removeClient(layoutObject);
             addClient(layoutObject, size);
         }