[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/layout/LayoutImage.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
@@ skipping 11 matching lines @@
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/layout/LayoutImage.h"
 
 #include "core/HTMLNames.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/ImagePainter.h"
 #include "core/svg/graphics/SVGImage.h"
 
@@ skipping 128 matching lines @@
 
   if (imageResource() && imageResource()->maybeAnimated())
     setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
   else
     setShouldDoFullPaintInvalidation(PaintInvalidationFull);
 
   // Tell any potential compositing layers that the image needs updating.
   contentChanged(ImageChanged);
 }
 
-void LayoutImage::imageNotifyFinished(ImageResource* newImage) {
+void LayoutImage::imageNotifyFinished(ImageResourceContent* newImage) {
   if (!m_imageResource)
     return;
 
   if (documentBeingDestroyed())
     return;
 
   invalidateBackgroundObscurationStatus();
 
   if (newImage == m_imageResource->cachedImage()) {
     // tell any potential compositing layers
@@ skipping 122 matching lines @@
 bool LayoutImage::needsPreferredWidthsRecalculation() const {
   if (LayoutReplaced::needsPreferredWidthsRecalculation())
     return true;
   return embeddedReplacedContent();
 }
 
 LayoutReplaced* LayoutImage::embeddedReplacedContent() const {
   if (!m_imageResource)
     return nullptr;
 
-  ImageResource* cachedImage = m_imageResource->cachedImage();
+  ImageResourceContent* cachedImage = m_imageResource->cachedImage();
   if (cachedImage && cachedImage->getImage() &&
       cachedImage->getImage()->isSVGImage())
     return toSVGImage(cachedImage->getImage())->embeddedReplacedContent();
 
   return nullptr;
 }
 
 }  // namespace blink