[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 e5e719e323f6557ce0df120451e1fb8c415d6369..53eb68023c2f428faaa4b7ae001f6fd46a5173b5 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;
 
  private:
   WebFrameSerializer::MHTMLPartsGenerationDelegate& m_webDelegate;
@@ -159,11 +160,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;
 }
 
 bool cacheControlNoStoreHeaderPresent(