Making PageSerializer operate on single frames only.

third_party/WebKit/Source/core/page/PageSerializer.cpp

Index: third_party/WebKit/Source/core/page/PageSerializer.cpp
diff --git a/third_party/WebKit/Source/core/page/PageSerializer.cpp b/third_party/WebKit/Source/core/page/PageSerializer.cpp
index 28ac4e0564ee129c437ae60281354dd5e06b5697..d5560ec32cd6e318b9c3d5831cb68c8567a7af78 100644
--- a/third_party/WebKit/Source/core/page/PageSerializer.cpp
+++ b/third_party/WebKit/Source/core/page/PageSerializer.cpp
@@ -304,20 +304,15 @@ PageSerializer::PageSerializer(Vector<SerializedResource>* resources, PassOwnPtr
 {
 }
 
-void PageSerializer::serialize(Page* page)
+void PageSerializer::serializeFrame(LocalFrame& frame)
 {
-    serializeFrame(page->deprecatedLocalMainFrame());
-}
-
-void PageSerializer::serializeFrame(LocalFrame* frame)
-{
-    ASSERT(frame->document());
-    Document& document = *frame->document();
+    ASSERT(frame.document());
+    Document& document = *frame.document();
     KURL url = document.url();
     // FIXME: This probably wants isAboutBlankURL? to exclude other about: urls (like about:srcdoc)?
     if (!url.isValid() || url.protocolIsAbout()) {
         // For blank frames we generate a fake URL so they can be referenced by their containing frame.
-        url = urlForBlankFrame(frame);
+        url = urlForBlankFrame(&frame);
     }
 
     if (m_resourceURLs.contains(url)) {
@@ -385,13 +380,6 @@ void PageSerializer::serializeFrame(LocalFrame* frame)
                 serializeCSSStyleSheet(*sheet, KURL());
         }
     }
-
-    for (Frame* childFrame = frame->tree().firstChild(); childFrame; childFrame = childFrame->tree().nextSibling()) {
-        // TODO(lukasza): This causes incomplete MHTML for OOPIFs.
-        // (crbug.com/538766)
-        if (childFrame->isLocalFrame())
-            serializeFrame(toLocalFrame(childFrame));
-    }
 }
 
 void PageSerializer::serializeCSSStyleSheet(CSSStyleSheet& styleSheet, const KURL& url)