Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

 /*
  * Copyright (C) 2011 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 107 matching lines @@
 
 CSSCrossfadeValue::~CSSCrossfadeValue()
 {
 #if !ENABLE(OILPAN)
     dispose();
 #endif
 }
 
 void CSSCrossfadeValue::dispose()
 {
-    if (m_cachedFromImage)
+    if (m_cachedFromImage) {
         m_cachedFromImage->removeClient(&m_crossfadeSubimageObserver);
-    if (m_cachedToImage)
+        m_cachedFromImage = nullptr;
+    }
+    if (m_cachedToImage) {
         m_cachedToImage->removeClient(&m_crossfadeSubimageObserver);
+        m_cachedToImage = nullptr;
+    }
 }
 
 String CSSCrossfadeValue::customCSSText() const
 {
     StringBuilder result;
     result.appendLiteral("-webkit-cross-fade(");
     result.append(m_fromValue->cssText());
     result.appendLiteral(", ");
     result.append(m_toValue->cssText());
     result.appendLiteral(", ");
@@ skipping 41 matching lines @@
     return subimageIsPending(m_fromValue.get()) || subimageIsPending(m_toValue.get());
 }
 
 bool CSSCrossfadeValue::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
     return subimageKnownToBeOpaque(m_fromValue.get(), layoutObject) && subimageKnownToBeOpaque(m_toValue.get(), layoutObject);
 }
 
 void CSSCrossfadeValue::loadSubimages(Document* document)
 {
-    ResourcePtr<ImageResource> oldCachedFromImage = m_cachedFromImage;
-    ResourcePtr<ImageResource> oldCachedToImage = m_cachedToImage;
+    RefPtrWillBeRawPtr<ImageResource> oldCachedFromImage = m_cachedFromImage;
+    RefPtrWillBeRawPtr<ImageResource> oldCachedToImage = m_cachedToImage;
 
     m_cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
     m_cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
 
     if (m_cachedFromImage != oldCachedFromImage) {
         if (oldCachedFromImage)
             oldCachedFromImage->removeClient(&m_crossfadeSubimageObserver);
         if (m_cachedFromImage)
             m_cachedFromImage->addClient(&m_crossfadeSubimageObserver);
     }
@@ skipping 61 matching lines @@
     return compareCSSValuePtr(m_fromValue, other.m_fromValue)
         && compareCSSValuePtr(m_toValue, other.m_toValue)
         && compareCSSValuePtr(m_percentageValue, other.m_percentageValue);
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue)
 {
     visitor->trace(m_fromValue);
     visitor->trace(m_toValue);
     visitor->trace(m_percentageValue);
+    visitor->trace(m_cachedFromImage);
+    visitor->trace(m_cachedToImage);
     visitor->trace(m_crossfadeSubimageObserver);
     CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink