[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/frame/FrameSerializer.h

Index: third_party/WebKit/Source/core/frame/FrameSerializer.h
diff --git a/third_party/WebKit/Source/core/frame/FrameSerializer.h b/third_party/WebKit/Source/core/frame/FrameSerializer.h
index 6ad615b02c359a6a54f8420260d48ad703df046f..094c5eedc94a797b4dd47e30b3b84b9c208a6b83 100644
--- a/third_party/WebKit/Source/core/frame/FrameSerializer.h
+++ b/third_party/WebKit/Source/core/frame/FrameSerializer.h
@@ -48,9 +48,8 @@ class CSSValue;
 class Document;
 class Element;
 class FontResource;
-class ImageResource;
+class ImageResourceContent;
 class LocalFrame;
-class Resource;
 class SharedBuffer;
 class StylePropertySet;
 
@@ -86,7 +85,9 @@ class CORE_EXPORT FrameSerializer final {
     virtual bool shouldSkipResourceWithURL(const KURL&) { return false; }
 
     // Tells whether to skip serialization of a subresource.
-    virtual bool shouldSkipResource(const Resource&) { return false; }
+    virtual bool shouldSkipResource(bool hasCacheControlNoStoreHeader) {
+      return false;
+    }
   };
 
   // Constructs a serializer that will write output to the given vector of
@@ -115,10 +116,11 @@ class CORE_EXPORT FrameSerializer final {
 
   bool shouldAddURL(const KURL&);
 
-  void addToResources(const Resource&,
+  void addToResources(const String& mimeType,
+                      bool hasCacheControlNoStoreHeader,
                       PassRefPtr<const SharedBuffer>,
                       const KURL&);
-  void addImageToResources(ImageResource*, const KURL&);
+  void addImageToResources(ImageResourceContent*, const KURL&);
   void addFontToResources(FontResource*);
 
   void retrieveResourcesForProperties(const StylePropertySet*, Document&);