Oilpan: Unship CSSValues and AnimatableValues

Source/core/css/CSSImageValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 54 matching lines @@
         FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
         request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer));
 
         if (options.corsEnabled == IsCORSEnabled)
             request.setCrossOriginAccessControl(document->securityOrigin(), options.allowCredentials, options.credentialsRequested);
 
         if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(request, document->fetcher()))
             m_image = StyleFetchedImage::create(cachedImage.get(), document);
     }
 
-    return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image) : 0;
+    return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image.get()) : 0;
 }
 
 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document)
 {
     if (!m_accessedImage || !m_image->isImageResource() || !document.fetcher())
         return;
     if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)))
         return;
 
     ImageResource* resource = m_image->cachedImage();
     if (!resource)
         return;
 
     FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options());
     MixedContentChecker::shouldBlockFetch(document.frame(), resource->lastResourceRequest(),
         resource->lastResourceRequest().url(), MixedContentChecker::SendReport);
     document.fetcher()->requestLoadStarted(resource, request, ResourceFetcher::ResourceLoadingFromCache);
 }
 
 bool CSSImageValue::hasFailedOrCanceledSubresources() const
 {
     if (!m_image || !m_image->isImageResource())
         return false;
-    if (Resource* cachedResource = toStyleFetchedImage(m_image)->cachedImage())
+    if (Resource* cachedResource = toStyleFetchedImage(m_image.get())->cachedImage())
         return cachedResource->loadFailedOrCanceled();
     return true;
 }
 
 bool CSSImageValue::equals(const CSSImageValue& other) const
 {
     return m_absoluteURL == other.m_absoluteURL;
 }
 
 String CSSImageValue::customCSSText() const
 {
     return "url(" + quoteCSSURLIfNeeded(m_absoluteURL) + ")";
 }
 
 bool CSSImageValue::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
     return m_image ? m_image->knownToBeOpaque(layoutObject) : false;
 }
 
-DEFINE_TRACE_AFTER_DISPATCH(CSSImageValue)
-{
-    visitor->trace(m_image);
-    CSSValue::traceAfterDispatch(visitor);
-}
-
 void CSSImageValue::reResolveURL(const Document& document)
 {
     KURL url = document.completeURL(m_relativeURL);
     if (url == m_absoluteURL)
         return;
     m_absoluteURL = url.string();
     m_accessedImage = false;
     m_image.clear();
 }
 
 } // namespace blink