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 172 matching lines @@
     Frame* frame = frameOwner.contentFrame();
     // FIXME: RemoteFrames not currently supported here.
     if (!frame || !frame->isLocalFrame())
         return;
 
     KURL url = toLocalFrame(frame)->document()->url();
     if (url.isValid() && !url.protocolIsAbout())
         return;
 
     // We need to give a fake location to blank frames so they can be referenced by the serialized frame.
-    url = m_serializer->urlForBlankFrame(toLocalFrame(frame));
+    url = m_serializer->urlForBlankFrame(*toLocalFrame(frame));
     appendAttribute(result, element, Attribute(frameOwnerURLAttributeName(frameOwner), AtomicString(url.string())), namespaces);
 }
 
 void SerializerMarkupAccumulator::appendStartTag(Node& node, Namespaces* namespaces)
 {
     MarkupAccumulator::appendStartTag(node, namespaces);
     m_nodes.append(&node);
 }
 
 void SerializerMarkupAccumulator::appendEndTag(const Element& element)
@@ skipping 93 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(const 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);
     }
 
     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
@@ skipping 52 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 149 matching lines @@
 void PageSerializer::registerRewriteURL(const String& from, const String& to)
 {
     m_rewriteURLs.set(from, to);
 }
 
 void PageSerializer::setRewriteURLFolder(const String& rewriteFolder)
 {
     m_rewriteFolder = rewriteFolder;
 }
 
-KURL PageSerializer::urlForBlankFrame(LocalFrame* frame)
+KURL PageSerializer::urlForBlankFrame(const LocalFrame& frame)
 {
-    BlankFrameURLMap::iterator iter = m_blankFrameURLs.find(frame);
+    BlankFrameURLMap::iterator iter = m_blankFrameURLs.find(&frame);
     if (iter != m_blankFrameURLs.end())
         return iter->value;
     String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
     KURL fakeURL(ParsedURLString, url);
-    m_blankFrameURLs.add(frame, fakeURL);
+    m_blankFrameURLs.add(&frame, fakeURL);
 
     return fakeURL;
 }
 
 PageSerializer::Delegate* PageSerializer::delegate()
 {
     return m_delegate.get();
 }
 
 // Returns MOTW (Mark of the Web) declaration before html tag which is in
@@ skipping 12 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