[ImageResource 4] Split ImageResource into Resource and Image parts

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

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 
 namespace blink {
 
 class Attribute;
 class CSSRule;
 class CSSStyleSheet;
 class CSSValue;
 class Document;
 class Element;
 class FontResource;
-class ImageResource;
+class ImageResourceContent;
 class LocalFrame;
-class Resource;
 class SharedBuffer;
 class StylePropertySet;
 
 struct SerializedResource;
 
 // This class is used to serialize frame's contents back to text (typically
 // HTML).  It serializes frame's document and resources such as images and CSS
 // stylesheets.
 class CORE_EXPORT FrameSerializer final {
   STACK_ALLOCATED();
@@ skipping 17 matching lines @@
     // If no link rewriting is desired, this method should return false.
     virtual bool rewriteLink(const Element&, String& rewrittenLink) {
       return false;
     }
 
     // Tells whether to skip serialization of a subresource or CSSStyleSheet
     // with a given URI. Used to deduplicate resources across multiple frames.
     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
   // SerializedResources and uses the Delegate for controlling some
   // serialization aspects.  Callers need to ensure that both arguments stay
   // alive until the FrameSerializer gets destroyed.
   FrameSerializer(Vector<SerializedResource>&, Delegate&);
 
   // Initiates the serialization of the frame. All serialized content and
   // retrieved resources are added to the Vector passed to the constructor.
   // The first resource in that vector is the frame's serialized content.
   // Subsequent resources are images, css, etc.
   void serializeFrame(const LocalFrame&);
 
   static String markOfTheWebDeclaration(const KURL&);
 
  private:
   // Serializes the stylesheet back to text and adds it to the resources if URL
   // is not-empty.  It also adds any resources included in that stylesheet
   // (including any imported stylesheets and their own resources).
   void serializeCSSStyleSheet(CSSStyleSheet&, const KURL&);
 
   // Serializes the css rule (including any imported stylesheets), adding
   // referenced resources.
   void serializeCSSRule(CSSRule*);
 
   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&);
   void retrieveResourcesForCSSValue(const CSSValue&, Document&);
 
   Vector<SerializedResource>* m_resources;
   HashSet<KURL> m_resourceURLs;
 
   bool m_isSerializingCss;
 
   Delegate& m_delegate;
 };
 
 }  // namespace blink
 
 #endif  // FrameSerializer_h