Making PageSerializer operate on single frames only.

third_party/WebKit/Source/web/tests/PageSerializerTest.cpp

 /*
  * Copyright (c) 2013, Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 29 matching lines @@
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebSettings.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
+#include "wtf/Assertions.h"
 #include "wtf/Vector.h"
 #include <gtest/gtest.h>
 
 using blink::URLTestHelpers::toKURL;
 using blink::URLTestHelpers::registerMockedURLLoad;
 
 namespace blink {
 
 class PageSerializerTest : public testing::Test {
 public:
@@ skipping 56 matching lines @@
 
     void serialize(const char* url)
     {
         FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(), KURL(m_baseUrl, url).string().utf8().data());
         PageSerializer serializer(&m_resources, nullptr);
 
         serializer.setRewriteURLFolder(m_rewriteFolder);
         for (const auto& rewriteURL: m_rewriteURLs)
             serializer.registerRewriteURL(rewriteURL.key, rewriteURL.value);
 
-        serializer.serialize(m_helper.webViewImpl()->mainFrameImpl()->frame()->page());
+        Frame* frame = m_helper.webViewImpl()->mainFrameImpl()->frame();
+        for (; frame; frame = frame->tree().traverseNext()) {
+            // This is safe, because tests do not do cross-site navigation
+            // (and therefore don't have remote frames).
+            LocalFrame* localFrame = toLocalFrame(frame);
+            serializer.serializeFrame(*localFrame);

[dcheng, 2015/11/18 03:27:12]

Nit: just inline toLocalFrame(*frame) here.

[Łukasz Anforowicz, 2015/11/18 18:40:41]

Done.

+        }
     }
 
     Vector<SerializedResource>& getResources()
     {
         return m_resources;
     }
 
-
     const SerializedResource* getResource(const char* url, const char* mimeType)
     {
         KURL kURL = KURL(m_baseUrl, url);
         String mime(mimeType);
         for (size_t i = 0; i < m_resources.size(); ++i) {
             const SerializedResource& resource = m_resources[i];
             if (resource.url == kURL && !resource.data->isEmpty()
                 && (mime.isNull() || equalIgnoringCase(resource.mimeType, mime)))
                 return &resource;
         }
@@ skipping 376 matching lines @@
     EXPECT_EQ("saved from url=(0015)http://foo.com/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com")));
     EXPECT_EQ("saved from url=(0015)http://f-o.com/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://f-o.com")));
     EXPECT_EQ("saved from url=(0019)http://foo.com-%2D/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com--")));
     EXPECT_EQ("saved from url=(0024)http://f-%2D.com-%2D%3E/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://f--.com-->")));
     EXPECT_EQ("saved from url=(0020)http://foo.com/?-%2D", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com?--")));
     EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#--")));
     EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#bar--baz")));
 }
 
 } // namespace blink