Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 193 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp b/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp
new file mode 100644
index 0000000..1416882
--- /dev/null
+++ b/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp
@@ -0,0 +1,193 @@
+/*
+ * 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebPageSerializer.h"
+
+#include "WebFrame.h"
+#include "WebFrameClient.h"
+#include "WebString.h"
+#include "WebURL.h"
+#include "WebURLRequest.h"
+#include "WebURLResponse.h"
+#include "WebView.h"
+
+#include <googleurl/src/gurl.h>
+#include <gtest/gtest.h>
+#include <webkit/support/webkit_support.h>
+
+using namespace WebKit;
+
+namespace {
+
+class TestWebFrameClient : public WebFrameClient {
+};
+
+class WebPageSerializerTest : public testing::Test {
+public:
+    WebPageSerializerTest() : m_webView(0), m_supportedSchemes(3U)
+    {
+        m_supportedSchemes[0] = "http";
+        m_supportedSchemes[1] = "https";
+        m_supportedSchemes[2] = "file";
+    }
+
+protected:
+    virtual void SetUp()
+    {
+        // Create and initialize the WebView.
+        m_webView = WebView::create(0);
+        m_webView->initializeMainFrame(&m_webFrameClient);
+    }
+
+    virtual void TearDown()
+    {
+        webkit_support::UnregisterAllMockedURLs();
+        m_webView->close();
+    }
+
+    void registerMockedURLLoad(const WebURL& url, const WebString& fileName)
+    {
+        WebURLResponse response;
+        response.initialize();
+        response.setMIMEType("text/html");
+        std::string filePath = webkit_support::GetWebKitRootDir().utf8();
+        filePath.append("/Source/WebKit/chromium/tests/data/pageserialization/");
+        filePath.append(fileName.utf8());
+        webkit_support::RegisterMockedURL(url, response, WebString::fromUTF8(filePath));
+    }
+
+    void loadURLInTopFrame(const GURL& url)
+    {
+        WebURLRequest urlRequest;
+        urlRequest.initialize();
+        urlRequest.setURL(WebURL(url));
+        m_webView->mainFrame()->loadRequest(urlRequest);
+        // Make sure any pending request get served.
+        webkit_support::ServeAsynchronousMockedRequests();
+    }
+
+    static bool webVectorContains(const WebVector<WebURL>& vector, char* url)
+    {
+        return vector.contains(WebURL(GURL(url)));
+    }
+
+    // Useful for debugging.
+    static void printWebURLs(const WebVector<WebURL>& urls)
+    {
+        for (size_t i = 0; i < urls.size(); i++)
+            printf("%s\n", urls[i].spec().data());
+    }
+
+    WebView* m_webView;
+    WebVector<WebCString> m_supportedSchemes;
+
+private:
+    TestWebFrameClient m_webFrameClient;
+};
+
+TEST_F(WebPageSerializerTest, HTMLNodes)
+{
+    // Register the mocked frame and load it.
+    WebURL topFrameURL = GURL("http://www.test.com");
+    registerMockedURLLoad(topFrameURL, WebString::fromUTF8("simple_page.html"));
+    loadURLInTopFrame(topFrameURL);
+
+    // Retrieve all resources.
+    WebVector<WebURL> frames;
+    WebVector<WebURL> resources;
+    ASSERT_TRUE(WebPageSerializer::retrieveAllResources(
+        m_webView, m_supportedSchemes, &resources, &frames));    
+
+    // Tests that all resources from the frame have been retrieved.
+    EXPECT_EQ(1, frames.size()); // There should be no duplicates.
+    EXPECT_TRUE(webVectorContains(frames, "http://www.test.com"));
+
+    EXPECT_EQ(14, resources.size()); // There should be no duplicates.
+    EXPECT_TRUE(webVectorContains(resources, "http://www.example.com/beautifull.css"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/awesome.js"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/bodyBackground.jpg"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/awesome.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/imageButton.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/tableBackground.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/trBackground.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/tdBackground.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.evene.fr/citations/auteur.php?ida=46"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.brainyquote.com/quotes/authors/c/charles_darwin.html"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/why_deleted.html"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/why_inserted.html"));
+    EXPECT_TRUE(webVectorContains(resources, "https://www.secure.com/https.gif"));
+    EXPECT_TRUE(webVectorContains(resources, "file://c/my_folder/file.gif"));
+}
+
+TEST_F(WebPageSerializerTest, MultipleFrames)
+{
+    // Register the mocked frames.
+    WebURL topFrameURL = GURL("http://www.test.com");
+    registerMockedURLLoad(topFrameURL, WebString::fromUTF8("top_frame.html"));
+    registerMockedURLLoad(GURL("http://www.test.com/simple_iframe.html"),
+                          WebString::fromUTF8("simple_iframe.html"));
+    registerMockedURLLoad(GURL("http://www.test.com/object_iframe.html"),
+                          WebString::fromUTF8("object_iframe.html"));
+    registerMockedURLLoad(GURL("http://www.test.com/embed_iframe.html"),
+                          WebString::fromUTF8("embed_iframe.html"));
+    // If we don't register a mocked resource for awesome.png, it causes the
+    // document loader of the iframe that has it as its src to assert on close,
+    // not sure why.
+    registerMockedURLLoad(GURL("http://www.test.com/awesome.png"),
+                          WebString::fromUTF8("awesome.png"));
+
+    loadURLInTopFrame(topFrameURL);
+
+    // Retrieve all resources.
+    WebVector<WebURL> frames;
+    WebVector<WebURL> resources;
+    ASSERT_TRUE(WebPageSerializer::retrieveAllResources(
+        m_webView, m_supportedSchemes, &resources, &frames));    
+
+    // Tests that all resources from the frame have been retrieved.
+    EXPECT_EQ(4, frames.size()); // There should be no duplicates.
+    EXPECT_TRUE(webVectorContains(frames, "http://www.test.com"));
+    EXPECT_TRUE(webVectorContains(frames, "http://www.test.com/simple_iframe.html"));
+    EXPECT_TRUE(webVectorContains(frames, "http://www.test.com/object_iframe.html"));
+    EXPECT_TRUE(webVectorContains(frames, "http://www.test.com/embed_iframe.html"));
+
+    EXPECT_EQ(5, resources.size()); // There should be no duplicates.
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/awesome.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/innerFrame.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/flash.swf"));
+    // FIXME: for some reason the following resources is missing on one of the bot
+    //        causing the test to fail. Probably a plugin issue.
+    // EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/music.mid"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/object.png"));
+    EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/embed.png"));
+}
+
+}