Adds a feature to MHTML serialization that omits subframes and subresources marked no-store.

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 30 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:
-    // Generates an MHTML header; returns false if an error occurred.  The
-    // header will be returned via the WebData out-param.
-    //
-    // 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 bool generateMHTMLHeader(
-        const WebString& boundary, WebFrameSerializerCacheControlPolicy, 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".
         // Format note - the returned string should be of the form "<foo@bar.com>"
         // (i.e. the strings should include the angle brackets).  The method
         // should return null WebString if the frame doesn't have a content-id.
         virtual WebString getContentID(WebFrame*) = 0;
+
+        virtual WebFrameSerializerCacheControlPolicy cacheControlPolicy() = 0;
+
+        virtual bool useBinaryEncoding() = 0;
     };
 
+    // Generates and returns an MHTML header.
+    //
+    // 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*, MHTMLPartsGenerationDelegate*);
+
     // Generates and returns MHTML parts for the given frame and the
     // savable resources underneath.
     //
     // 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 generateMHTMLParts(
-        const WebString& boundary, WebLocalFrame*, bool useBinaryEncoding,
-        MHTMLPartsGenerationDelegate*);
+        const WebString& boundary, WebLocalFrame*, MHTMLPartsGenerationDelegate*);
 
     // Generates and returns an MHTML footer.
     //
     // 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 generateMHTMLFooter(const WebString& boundary);
 
     // IMPORTANT:
     // The API below is an older implementation of frame serialization that
@@ skipping 42 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