[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 0439d2e9beae7765fcf3e63b4fb578315f11e32c..6fbd199f64f25d8f191b4518e9aa3a6c0956cdd2 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;
 
@@ -88,7 +87,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) {

[yhirano, 2016/12/05 09:02:04]

Can you use enum rather than a boolean parameter?

[hiroshige, 2016/12/06 09:32:51]

Done, but better name might be needed.

+      return false;
+    }
   };
 
   // Constructs a serializer that will write output to the given vector of
@@ -117,10 +118,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&);