Remove "recursive" parameter from WebPageSerializer::serialize.

third_party/WebKit/Source/web/WebPageSerializerImpl.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 407 matching lines @@
     case Node::DOCUMENT_TYPE_NODE:
         param->haveSeenDocType = true;
     default:
         // For other type node, call default action.
         saveHTMLContentToBuffer(createMarkup(node), param);
         break;
     }
 }
 
 WebPageSerializerImpl::WebPageSerializerImpl(WebFrame* frame,
-                                             bool recursiveSerialization,
                                              WebPageSerializerClient* client,
                                              const WebVector<WebURL>& links,
                                              const WebVector<WebString>& localPaths,
                                              const WebString& localDirectoryName)
     : m_client(client)
-    , m_recursiveSerialization(recursiveSerialization)
-    , m_framesCollected(false)
     , m_localDirectoryName(localDirectoryName)
     , m_htmlEntities(false)
     , m_xmlEntities(true)
 {
     // Must specify available webframe.
     ASSERT(frame);
     m_specifiedWebLocalFrameImpl = toWebLocalFrameImpl(frame);
     // Make sure we have non 0 client.
     ASSERT(client);
     // Build local resources map.
     ASSERT(links.size() == localPaths.size());
     for (size_t i = 0; i < links.size(); i++) {
         KURL url = links[i];
         ASSERT(!m_localLinks.contains(url.string()));
         m_localLinks.set(url.string(), localPaths[i]);
     }
 
     ASSERT(m_dataBuffer.isEmpty());
 }
 
-void WebPageSerializerImpl::collectTargetFrames()
-{
-    ASSERT(!m_framesCollected);
-    m_framesCollected = true;
-
-    // First, process main frame.
-    m_frames.append(m_specifiedWebLocalFrameImpl);
-    // Return now if user only needs to serialize specified frame, not including
-    // all sub-frames.
-    if (!m_recursiveSerialization)
-        return;
-    // Collect all frames inside the specified frame.
-    for (WebLocalFrameImpl* frame : m_frames) {
-        // Get current using document.
-        Document* currentDoc = frame->frame()->document();
-        // Go through sub-frames.
-        RefPtrWillBeRawPtr<HTMLAllCollection> all = currentDoc->all();
-
-        for (unsigned i = 0; Element* element = all->item(i); ++i) {
-            if (!element->isHTMLElement())
-                continue;
-            WebLocalFrameImpl* webFrame =
-                WebLocalFrameImpl::fromFrameOwnerElement(element);
-            if (webFrame)
-                m_frames.append(webFrame);
-        }
-    }
-}
-
 bool WebPageSerializerImpl::serialize()
 {
-    if (!m_framesCollected)
-        collectTargetFrames();
-
     bool didSerialization = false;
     KURL mainURL = m_specifiedWebLocalFrameImpl->frame()->document()->url();
 
-    for (unsigned i = 0; i < m_frames.size(); ++i) {
-        WebLocalFrameImpl* webFrame = m_frames[i];
-        Document* document = webFrame->frame()->document();
-        const KURL& url = document->url();
+    WebLocalFrameImpl* webFrame = m_specifiedWebLocalFrameImpl;
+    Document* document = webFrame->frame()->document();
+    const KURL& url = document->url();
 
-        if (!url.isValid() || !m_localLinks.contains(url.string()))
-            continue;
-
+    if (url.isValid() || m_localLinks.contains(url.string())) {

[dcheng, 2015/09/25 19:53:52]

Should this be &&?

[Łukasz Anforowicz, 2015/09/25 20:35:57]

Right.  My bad.

         didSerialization = true;
 
         const WTF::TextEncoding& textEncoding = document->encoding().isValid() ? document->encoding() : UTF8Encoding();
         String directoryName = url == mainURL ? m_localDirectoryName : "";
 
         SerializeDomParam param(url, textEncoding, document, directoryName);
 
         Element* documentElement = document->documentElement();
         if (documentElement)
             buildContentForNode(documentElement, &param);
 
         encodeAndFlushBuffer(WebPageSerializerClient::CurrentFrameIsFinished, &param, ForceFlush);
     }
 
     ASSERT(m_dataBuffer.isEmpty());
     m_client->didSerializeDataForFrame(KURL(), WebCString("", 0), WebPageSerializerClient::AllFramesAreFinished);
     return didSerialization;
 }
 
 }  // namespace blink