Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 120 insertions, 3 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp
index 8fcf33009..331915e00 100644
--- a/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp
@@ -22,13 +22,18 @@
 #include "config.h"
 
 #include "LoadTrackingTest.h"
+#include "WebKitTestBus.h"
 #include "WebKitTestServer.h"
+#include "WebViewTest.h"
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
 #include <wtf/text/CString.h>
 
+static WebKitTestBus* bus;
 static WebKitTestServer* kServer;
 
+const char* kDNTHeaderNotPresent = "DNT header not present";
+
 static void testLoadingStatus(LoadTrackingTest* test, gconstpointer data)
 {
     test->setRedirectURI(kServer->getURIForPath("/normal").data());
@@ -214,9 +219,7 @@ public:
 private:
     void checkActiveURI(const char* uri)
     {
-        // g_assert_cmpstr is a macro, so we need to cache the temporary string.
-        CString serverURI = kServer->getURIForPath(uri);
-        g_assert_cmpstr(m_activeURI.data(), ==, serverURI.data());
+        ASSERT_CMP_CSTRING(m_activeURI, ==, kServer->getURIForPath(uri));
     }
 };
 
@@ -282,6 +285,105 @@ static void testWebViewIsLoading(ViewIsLoadingTest* test, gconstpointer)
     test->waitUntilLoadFinished();
 }
 
+class WebPageURITest: public WebViewTest {
+public:
+    MAKE_GLIB_TEST_FIXTURE(WebPageURITest);
+
+    static void webPageURIChangedCallback(GDBusConnection*, const char*, const char*, const char*, const char*, GVariant* result, WebPageURITest* test)
+    {
+        const char* uri;
+        g_variant_get(result, "(&s)", &uri);
+        test->m_webPageURIs.append(uri);
+    }
+
+    static void webViewURIChanged(GObject*, GParamSpec*, WebPageURITest* test)
+    {
+        test->m_webViewURIs.append(webkit_web_view_get_uri(test->m_webView));
+    }
+
+    WebPageURITest()
+    {
+        GRefPtr<GDBusProxy> proxy = adoptGRef(bus->createProxy("org.webkit.gtk.WebExtensionTest",
+            "/org/webkit/gtk/WebExtensionTest", "org.webkit.gtk.WebExtensionTest", m_mainLoop));
+        m_uriChangedSignalID = g_dbus_connection_signal_subscribe(
+            g_dbus_proxy_get_connection(proxy.get()),
+            0,
+            "org.webkit.gtk.WebExtensionTest",
+            "URIChanged",
+            "/org/webkit/gtk/WebExtensionTest",
+            0,
+            G_DBUS_SIGNAL_FLAGS_NONE,
+            reinterpret_cast<GDBusSignalCallback>(webPageURIChangedCallback),
+            this,
+            0);
+        g_assert(m_uriChangedSignalID);
+
+        g_signal_connect(m_webView, "notify::uri", G_CALLBACK(webViewURIChanged), this);
+    }
+
+    ~WebPageURITest()
+    {
+        g_signal_handlers_disconnect_matched(m_webView, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, this);
+        g_dbus_connection_signal_unsubscribe(bus->connection(), m_uriChangedSignalID);
+    }
+
+    unsigned m_uriChangedSignalID;
+    Vector<CString> m_webPageURIs;
+    Vector<CString> m_webViewURIs;
+};
+
+static void testWebPageURI(WebPageURITest* test, gconstpointer)
+{
+    test->loadURI(kServer->getURIForPath("/redirect").data());
+    test->waitUntilLoadFinished();
+
+    g_assert_cmpint(test->m_webPageURIs.size(), ==, test->m_webViewURIs.size());
+    for (size_t i = 0; i < test->m_webPageURIs.size(); ++i)
+        ASSERT_CMP_CSTRING(test->m_webPageURIs[i], ==, test->m_webViewURIs[i]);
+
+    g_assert_cmpint(test->m_webPageURIs.size(), ==, 2);
+    ASSERT_CMP_CSTRING(test->m_webPageURIs[0], ==, kServer->getURIForPath("/redirect"));
+    ASSERT_CMP_CSTRING(test->m_webPageURIs[1], ==, kServer->getURIForPath("/normal"));
+
+}
+
+static void testURIRequestHTTPHeaders(WebViewTest* test, gconstpointer)
+{
+    GRefPtr<WebKitURIRequest> uriRequest = adoptGRef(webkit_uri_request_new("file:///foo/bar"));
+    g_assert(uriRequest.get());
+    g_assert_cmpstr(webkit_uri_request_get_uri(uriRequest.get()), ==, "file:///foo/bar");
+    g_assert(!webkit_uri_request_get_http_headers(uriRequest.get()));
+
+    // Load a request with no Do Not Track header.
+    webkit_uri_request_set_uri(uriRequest.get(), kServer->getURIForPath("/do-not-track-header").data());
+    test->loadRequest(uriRequest.get());
+    test->waitUntilLoadFinished();
+
+    size_t mainResourceDataSize = 0;
+    const char* mainResourceData = test->mainResourceData(mainResourceDataSize);
+    g_assert_cmpint(mainResourceDataSize, ==, strlen(kDNTHeaderNotPresent));
+    g_assert(!strncmp(mainResourceData, kDNTHeaderNotPresent, mainResourceDataSize));
+
+    // Add the Do Not Track header and load the request again.
+    SoupMessageHeaders* headers = webkit_uri_request_get_http_headers(uriRequest.get());
+    g_assert(headers);
+    soup_message_headers_append(headers, "DNT", "1");
+    test->loadRequest(uriRequest.get());
+    test->waitUntilLoadFinished();
+
+    mainResourceData = test->mainResourceData(mainResourceDataSize);
+    g_assert_cmpint(mainResourceDataSize, ==, 1);
+    g_assert(!strncmp(mainResourceData, "1", mainResourceDataSize));
+
+    // Load a URI for which the web extension will add the Do Not Track header.
+    test->loadURI(kServer->getURIForPath("/add-do-not-track-header").data());
+    test->waitUntilLoadFinished();
+
+    mainResourceData = test->mainResourceData(mainResourceDataSize);
+    g_assert_cmpint(mainResourceDataSize, ==, 1);
+    g_assert(!strncmp(mainResourceData, "1", mainResourceDataSize));
+}
+
 static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
 {
     static const char* responseString = "<html><body>Testing!Testing!Testing!Testing!Testing!Testing!Testing!"
@@ -312,6 +414,13 @@ static void serverCallback(SoupServer* server, SoupMessage* message, const char*
         soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, responseString, strlen(responseString));
         soup_server_unpause_message(server, message);
         return;
+    } else if (g_str_equal(path, "/do-not-track-header") || g_str_equal(path, "/add-do-not-track-header")) {
+        const char* doNotTrack = soup_message_headers_get_one(message->request_headers, "DNT");
+        if (doNotTrack)
+            soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, doNotTrack, strlen(doNotTrack));
+        else
+            soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, kDNTHeaderNotPresent, strlen(kDNTHeaderNotPresent));
+        soup_message_set_status(message, SOUP_STATUS_OK);
     } else
         soup_message_set_status(message, SOUP_STATUS_NOT_FOUND);
 
@@ -320,6 +429,11 @@ static void serverCallback(SoupServer* server, SoupMessage* message, const char*
 
 void beforeAll()
 {
+    webkit_web_context_set_web_extensions_directory(webkit_web_context_get_default(), WEBKIT_TEST_WEB_EXTENSIONS_DIR);
+    bus = new WebKitTestBus();
+    if (!bus->run())
+        return;
+
     kServer = new WebKitTestServer();
     kServer->run(serverCallback);
 
@@ -340,9 +454,12 @@ void beforeAll()
     ViewURITrackingTest::add("WebKitWebView", "active-uri", testWebViewActiveURI);
 
     ViewIsLoadingTest::add("WebKitWebView", "is-loading", testWebViewIsLoading);
+    WebPageURITest::add("WebKitWebPage", "get-uri", testWebPageURI);
+    WebViewTest::add("WebKitURIRequest", "http-headers", testURIRequestHTTPHeaders);
 }
 
 void afterAll()
 {
+    delete bus;
     delete kServer;
 }