Making PageSerializer operate on single frames only.

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

 /*
  * Copyright (C) 2011 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 286 matching lines @@
 }
 
 
 PageSerializer::PageSerializer(Vector<SerializedResource>* resources, PassOwnPtr<Delegate> delegate)
     : m_resources(resources)
     , m_blankFrameCounter(0)
     , m_delegate(delegate)
 {
 }
 
-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)) {
         // FIXME: We could have 2 frame with the same URL but which were dynamically changed and have now
         // different content. So we should serialize both and somehow rename the frame src in the containing
         // frame. Arg!
         return;
     }
 
     // If frame is an image document, add the image and don't continue
@@ skipping 47 matching lines @@
                 KURL url = document.completeURL(linkElement.getAttribute(HTMLNames::hrefAttr));
                 serializeCSSStyleSheet(*sheet, url);
                 ASSERT(m_resourceURLs.contains(url));
             }
         } else if (isHTMLStyleElement(element)) {
             HTMLStyleElement& styleElement = toHTMLStyleElement(element);
             if (CSSStyleSheet* sheet = styleElement.sheet())
                 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)
 {
     StringBuilder cssText;
     cssText.appendLiteral("@charset \"");
     cssText.append(styleSheet.contents()->charset().lower());
     cssText.appendLiteral("\";\n\n");
 
     for (unsigned i = 0; i < styleSheet.length(); ++i) {
@@ skipping 192 matching lines @@
             continue;
         }
         emitsMinus = ch == '-';
         builder.append(ch);
     }
     CString escapedUrl = builder.toString().ascii();
     return String::format("saved from url=(%04d)%s", static_cast<int>(escapedUrl.length()), escapedUrl.data());
 }
 
 } // namespace blink