Introduces a new MHTML generation parameter specifying different behvaior for cache-control headers.

third_party/WebKit/public/web/WebFrameSerializer.h

 /*
  * 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 29 matching lines @@
 namespace blink {
 
 class WebFrameSerializerClient;
 class WebFrame;
 class WebLocalFrame;
 template <typename T> class WebVector;
 
 // Serialization of frame contents into html or mhtml.
 class WebFrameSerializer {
 public:
+    // By default, frame serialization encompasses all resources in a page.  If it
+    // is desirable to serialize only those resources that could be stored by a http
+    // cache, the other options may be used.
+    // FIXME: Add more policies for subframes and subresources.

[Łukasz Anforowicz, 2016/05/12 18:56:49]

nit: I've been told by other reviewers to prefer TODO(alias) + to refer to a bug
:-)

[dewittj, 2016/05/12 22:58:01]

Done.

+    enum CacheControlPolicy {
+        CacheControlPolicyIgnore,
+        CacheControlPolicyFailForNoStoreMainFrame
+    };
+
     // Generates and returns an MHTML header.

[Łukasz Anforowicz, 2016/05/12 18:56:49]

nit: This should describe the new return value / talk about returning the header
contents via the last parameter.

[dewittj, 2016/05/12 22:58:02]

Done.

     //
     // Contents of the header (i.e. title and mime type) will be based
     // on the frame passed as an argument (which typically should be
     // the main, top-level frame).
     //
     // Same |boundary| needs to used for all generateMHTMLHeader and
     // generateMHTMLParts and generateMHTMLFooter calls that belong to the same
     // MHTML document (see also rfc1341, section 7.2.1, "boundary" description).
-    BLINK_EXPORT static WebData generateMHTMLHeader(
-        const WebString& boundary, WebLocalFrame*);
+    BLINK_EXPORT static bool generateMHTMLHeader(
+        const WebString& boundary, CacheControlPolicy, WebLocalFrame*,
+        WebData*);
 
     // Delegate for controling the behavior of generateMHTMLParts method.
     class MHTMLPartsGenerationDelegate {
     public:
         // Tells whether to skip serialization of a subresource with a given URI.
         // Used to deduplicate resources across multiple frames.
         virtual bool shouldSkipResource(const WebURL&) = 0;
 
         // Returns a Content-ID to be used for the given frame.
         // See rfc2557 - section 8.3 - "Use of the Content-ID header and CID URLs".
@@ skipping 67 matching lines @@
     BLINK_EXPORT static WebString generateMetaCharsetDeclaration(const WebString& charset);
     // Generate the MOTW declaration.
     BLINK_EXPORT static WebString generateMarkOfTheWebDeclaration(const WebURL&);
     // Generate the default base tag declaration.
     BLINK_EXPORT static WebString generateBaseTagDeclaration(const WebString& baseTarget);
 };
 
 } // namespace blink
 
 #endif