OOPIFs: Transitioning MHTML generation from view-oriented to frame-oriented.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 0db8f24e912c0fabcddef7f30b37c8e696090b5a..90c97c957caed0f01c3886fa2093f1c7339df413 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6,13 +6,16 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/debug/asan_invalid_access.h"
 #include "base/debug/dump_without_crashing.h"
+#include "base/files/file.h"
 #include "base/i18n/char_iterator.h"
+#include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
@@ -134,6 +137,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_util.h"
+#include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ -1250,6 +1254,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
                         OnGetSavableResourceLinks)
     IPC_MESSAGE_HANDLER(FrameMsg_GetSerializedHtmlWithLocalLinks,
                         OnGetSerializedHtmlWithLocalLinks)
+    IPC_MESSAGE_HANDLER(FrameMsg_SerializeAsMHTML, OnSerializeAsMHTML)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
 #elif defined(OS_MACOSX)
@@ -4702,6 +4707,63 @@ void RenderFrameImpl::OnGetSerializedHtmlWithLocalLinks(
                                local_directory_path.AsUTF16Unsafe());
 }
 
+void RenderFrameImpl::OnSerializeAsMHTML(
+    int job_id,
+    IPC::PlatformFileForTransit file_for_transit,
+    const std::string& std_mhtml_boundary,
+    const std::map<int, std::string>& frame_routing_id_to_content_id,
+    bool is_last_frame) {
+  // Unpack IPC payload.
+  base::File file = IPC::PlatformFileForTransitToFile(file_for_transit);
+  WebString mhtml_boundary = WebString::fromUTF8(std_mhtml_boundary);
+  std::vector<std::pair<WebFrame*, WebString>> web_frame_to_content_id;
+  for (const auto& it : frame_routing_id_to_content_id) {
+    const std::string& content_id = it.second;
+    WebFrame* web_frame = GetWebFrameFromRoutingIdForFrameOrProxy(it.first);
+    if (!web_frame)
+      continue;
+
+    web_frame_to_content_id.push_back(
+        std::make_pair(web_frame, WebString::fromUTF8(content_id)));
+  }
+
+  WebData data;
+  bool success = true;
+
+  // Generate MHTML header if needed.
+  if (success && IsMainFrame()) {

[dcheng, 2015/12/08 06:22:27]

Isn't success always true here?

[Łukasz Anforowicz, 2015/12/08 21:26:43]

Yes - it is always true.  I've written this way for symmetry between the 3
cases.  I can remove it.

+    data =
+        WebPageSerializer::generateMHTMLHeader(mhtml_boundary, GetWebFrame());
+    if (file.WriteAtCurrentPos(data.data(), data.size()) < 0) {
+      success = false;
+    }
+  }
+  DCHECK(!mhtml_boundary.isEmpty());

[dcheng, 2015/12/08 06:22:27]

Seems like this should probably go with where it's unpacked, for clarity
(otherwise, it looks like generateMHTMLHeader could mutate it). Also make it
const for good measure?

[Łukasz Anforowicz, 2015/12/08 21:26:43]

Good point.  Done.

+
+  // Generate MHTML parts.
+  if (success) {
+    data = WebPageSerializer::generateMHTMLParts(
+        mhtml_boundary, GetWebFrame(), false, web_frame_to_content_id);
+    // TODO(jcivelli): write the chunks in deferred tasks to give a chance to
+    //                 the message loop to process other events.
+    if (file.WriteAtCurrentPos(data.data(), data.size()) < 0) {
+      success = false;
+    }
+  }
+
+  // Generate MHTML footer if needed.
+  if (success && is_last_frame) {
+    data = WebPageSerializer::generateMHTMLFooter(mhtml_boundary);
+    if (file.WriteAtCurrentPos(data.data(), data.size()) < 0) {
+      success = false;
+    }
+  }
+
+  // Cleanup and notify the browser process about completion.
+  file.Close();  // Need to flush file contents before sending IPC response.
+  Send(new FrameHostMsg_SerializeAsMHTMLResponse(routing_id_, job_id, success));
+}
+
 void RenderFrameImpl::OpenURL(const GURL& url,
                               const Referrer& referrer,
                               WebNavigationPolicy policy,