Making PageSerializer operate on single frames only.

third_party/WebKit/Source/web/WebPageSerializer.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 70 matching lines @@
     // plays nicely with srcset.
     return attribute.localName() == HTMLNames::srcsetAttr;
 }
 
 } // namespace
 
 static PassRefPtr<SharedBuffer> serializePageToMHTML(Page* page, MHTMLArchive::EncodingPolicy encodingPolicy)
 {
     Vector<SerializedResource> resources;
     PageSerializer serializer(&resources, adoptPtr(new MHTMLPageSerializerDelegate));
-    serializer.serialize(page);
+
+    RefPtr<SharedBuffer> output = SharedBuffer::create();
+    String boundary = MHTMLArchive::generateMHTMLBoundary();
+
     Document* document = page->deprecatedLocalMainFrame()->document();
-    return MHTMLArchive::generateMHTMLData(resources, encodingPolicy, document->title(), document->suggestedMIMEType());
+    MHTMLArchive::generateMHTMLHeader(
+        boundary, document->title(), document->suggestedMIMEType(), *output);
+
+    for (Frame* frame = page->deprecatedLocalMainFrame(); frame; frame = frame->tree().traverseNext()) {
+        // TODO(lukasza): This causes incomplete MHTML for OOPIFs.
+        // (crbug.com/538766)
+        if (!frame->isLocalFrame())
+            continue;
+
+        resources.clear();
+        serializer.serializeFrame(*toLocalFrame(frame));
+
+        for (const auto& resource : resources) {
+            MHTMLArchive::generateMHTMLPart(
+                boundary, encodingPolicy, resource, *output);
+        }
+    }
+
+    MHTMLArchive::generateMHTMLFooter(boundary, *output);
+    return output.release();
 }
 
 WebCString WebPageSerializer::serializeToMHTML(WebView* view)
 {
     RefPtr<SharedBuffer> mhtml = serializePageToMHTML(toWebViewImpl(view)->page(), MHTMLArchive::UseDefaultEncoding);
     // FIXME: we are copying all the data here. Idealy we would have a WebSharedData().
     return WebCString(mhtml->data(), mhtml->size());
 }
 
 WebCString WebPageSerializer::serializeToMHTMLUsingBinaryEncoding(WebView* view)
@@ skipping 33 matching lines @@
 WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTarget)
 {
     // TODO(yosin) We should call |PageSerializer::baseTagDeclarationOf()|.
     if (baseTarget.isEmpty())
         return String("<base href=\".\">");
     String baseString = "<base href=\".\" target=\"" + static_cast<const String&>(baseTarget) + "\">";
     return baseString;
 }
 
 } // namespace blink