[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/web/WebFrameSerializer.cpp

Index: third_party/WebKit/Source/web/WebFrameSerializer.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameSerializer.cpp b/third_party/WebKit/Source/web/WebFrameSerializer.cpp
index a6765b7ff48d4eef376b11fc66a9114b92ad1e64..1cec65c87867607ab1bc896e75240a35ca988755 100644
--- a/third_party/WebKit/Source/web/WebFrameSerializer.cpp
+++ b/third_party/WebKit/Source/web/WebFrameSerializer.cpp
@@ -84,7 +84,8 @@ class MHTMLFrameSerializerDelegate final : public FrameSerializer::Delegate {
   bool shouldIgnoreAttribute(const Element&, const Attribute&) override;
   bool rewriteLink(const Element&, String& rewrittenLink) override;
   bool shouldSkipResourceWithURL(const KURL&) override;
-  bool shouldSkipResource(const Resource&) override;
+  bool shouldSkipResource(
+      FrameSerializer::ResourceHasCacheControlNoStoreHeader) override;
   Vector<Attribute> getCustomAttributes(const Element&) override;
 
  private:
@@ -160,11 +161,13 @@ bool MHTMLFrameSerializerDelegate::shouldSkipResourceWithURL(const KURL& url) {
 }
 
 bool MHTMLFrameSerializerDelegate::shouldSkipResource(
-    const Resource& resource) {
+    FrameSerializer::ResourceHasCacheControlNoStoreHeader
+        hasCacheControlNoStoreHeader) {
   return m_webDelegate.cacheControlPolicy() ==
              WebFrameSerializerCacheControlPolicy::
                  SkipAnyFrameOrResourceMarkedNoStore &&
-         resource.hasCacheControlNoStoreHeader();
+         hasCacheControlNoStoreHeader ==
+             FrameSerializer::HasCacheControlNoStoreHeader;
 }
 
 Vector<Attribute> MHTMLFrameSerializerDelegate::getCustomAttributes(