[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/web/WebFrameSerializer.cpp

 /*
  * Copyright (C) 2009 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 66 matching lines @@
 
 class MHTMLFrameSerializerDelegate final : public FrameSerializer::Delegate {
   WTF_MAKE_NONCOPYABLE(MHTMLFrameSerializerDelegate);
 
  public:
   explicit MHTMLFrameSerializerDelegate(
       WebFrameSerializer::MHTMLPartsGenerationDelegate&);
   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;
 };
 
 MHTMLFrameSerializerDelegate::MHTMLFrameSerializerDelegate(
     WebFrameSerializer::MHTMLPartsGenerationDelegate& webDelegate)
     : m_webDelegate(webDelegate) {}
 
 bool MHTMLFrameSerializerDelegate::shouldIgnoreAttribute(
@@ skipping 54 matching lines @@
   }
 
   return false;
 }
 
 bool MHTMLFrameSerializerDelegate::shouldSkipResourceWithURL(const KURL& url) {
   return m_webDelegate.shouldSkipResource(url);
 }
 
 bool MHTMLFrameSerializerDelegate::shouldSkipResource(
-    const Resource& resource) {
+    FrameSerializer::ResourceHasCacheControlNoStoreHeader
+        hasCacheControlNoStoreHeader) {
   return m_webDelegate.cacheControlPolicy() ==
              WebFrameSerializerCacheControlPolicy::
                  SkipAnyFrameOrResourceMarkedNoStore &&
-         resource.hasCacheControlNoStoreHeader();
+         hasCacheControlNoStoreHeader ==
+             FrameSerializer::HasCacheControlNoStoreHeader;
 }
 
 bool cacheControlNoStoreHeaderPresent(
     const WebLocalFrameImpl& webLocalFrameImpl) {
   const ResourceResponse& response =
       webLocalFrameImpl.dataSource()->response().toResourceResponse();
   if (response.cacheControlContainsNoStore())
     return true;
 
   const ResourceRequest& request =
@@ skipping 146 matching lines @@
     const WebString& baseTarget) {
   // TODO(yosin) We should call |FrameSerializer::baseTagDeclarationOf()|.
   if (baseTarget.isEmpty())
     return String("<base href=\".\">");
   String baseString = "<base href=\".\" target=\"" +
                       static_cast<const String&>(baseTarget) + "\">";
   return baseString;
 }
 
 }  // namespace blink