[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

 /*
  * Copyright (C) 2012 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/style/StyleFetchedImageSet.h"
 
 #include "core/css/CSSImageSetValue.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/layout/LayoutObject.h"
 #include "core/svg/graphics/SVGImageForContainer.h"
 
 namespace blink {
 
-StyleFetchedImageSet::StyleFetchedImageSet(ImageResource* image,
+StyleFetchedImageSet::StyleFetchedImageSet(ImageResourceContent* image,
                                            float imageScaleFactor,
                                            CSSImageSetValue* value,
                                            const KURL& url)
     : m_bestFitImage(image),
       m_imageScaleFactor(imageScaleFactor),
       m_imageSetValue(value),
       m_url(url) {
   m_isImageResourceSet = true;
   m_bestFitImage->addObserver(this);
   ThreadState::current()->registerPreFinalizer(this);
 }
 
 StyleFetchedImageSet::~StyleFetchedImageSet() {}
 
 void StyleFetchedImageSet::dispose() {
   m_bestFitImage->removeObserver(this);
   m_bestFitImage = nullptr;
 }
 
 WrappedImagePtr StyleFetchedImageSet::data() const {
   return m_bestFitImage.get();
 }
 
-ImageResource* StyleFetchedImageSet::cachedImage() const {
+ImageResourceContent* StyleFetchedImageSet::cachedImage() const {
   return m_bestFitImage.get();
 }
 
 CSSValue* StyleFetchedImageSet::cssValue() const {
   return m_imageSetValue;
 }
 
 CSSValue* StyleFetchedImageSet::computedCSSValue() const {
   return m_imageSetValue->valueWithURLsMadeAbsolute();
 }
@@ skipping 65 matching lines @@
       Image::PreCacheMetadata);
 }
 
 DEFINE_TRACE(StyleFetchedImageSet) {
   visitor->trace(m_bestFitImage);
   visitor->trace(m_imageSetValue);
   StyleImage::trace(visitor);
 }
 
 }  // namespace blink