[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/platform/graphics/Image.h

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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
@@ skipping 122 matching lines @@
   virtual ImageAnimationPolicy animationPolicy() {
     return ImageAnimationPolicyAllowed;
   }
   virtual void advanceTime(double deltaTimeInSeconds) {}
 
   // Advances an animated image. For BitmapImage (e.g., animated gifs) this
   // will advance to the next frame. For SVGImage, this will trigger an
   // animation update for CSS and advance the SMIL timeline by one frame.
   virtual void advanceAnimationForTesting() {}
 
-  // Typically the ImageResource that owns us.
+  // Typically the ImageResourceContent that owns us.
   ImageObserver* getImageObserver() const {
     return m_imageObserverDisabled ? nullptr : m_imageObserver;
   }
   void clearImageObserver() { m_imageObserver = nullptr; }
   // To avoid interleaved accesses to |m_imageObserverDisabled|, do not call
   // setImageObserverDisabled() other than from ImageObserverDisabler.
   void setImageObserverDisabled(bool disabled) {
     m_imageObserverDisabled = disabled;
   }
 
@@ skipping 57 matching lines @@
                        const FloatSize& tileScaleFactor,
                        TileRule hRule,
                        TileRule vRule,
                        SkBlendMode);
 
  private:
   RefPtr<SharedBuffer> m_encodedImageData;
   // TODO(Oilpan): consider having Image on the Oilpan heap and
   // turn this into a Member<>.
   //
-  // The observer (an ImageResource) is an untraced member, with the
-  // ImageResource being responsible for clearing itself out.
+  // The observer (an ImageResourceContent) is an untraced member, with the
+  // ImageResourceContent being responsible for clearing itself out.
   UntracedMember<ImageObserver> m_imageObserver;
   bool m_imageObserverDisabled;
 };
 
 #define DEFINE_IMAGE_TYPE_CASTS(typeName)                          \
   DEFINE_TYPE_CASTS(typeName, Image, image, image->is##typeName(), \
                     image.is##typeName())
 
 }  // namespace blink
 
 #endif