Changeset 201505 in webkit

Timestamp:

May 31, 2016, 12:22:40 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Test /webkit2/WebKitWebView/geolocation-permission-requests is failing since r201423
​https://bugs.webkit.org/show_bug.cgi?id=158200

Reviewed by Philippe Normand.

This is because geolocation is no longer allowed for non secure sites, like HTTP. In that case
POSITION_UNAVAILABLE is returned without asking the API layer.

• TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:

(testWebViewGeolocationPermissionRequests): Keep the HTTP case to check that it indeed returns
POSITION_UNAVAILABLE and use HTTPS URLs to check permission requests are allowed or denied. Also stop using the
document title, and use user script messages that are more reliable instead.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-05-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Test /webkit2/WebKitWebView/geolocation-permission-requests is failing since r201423
+        https://bugs.webkit.org/show_bug.cgi?id=158200
+
+        Reviewed by Philippe Normand.
+
+        This is because geolocation is no longer allowed for non secure sites, like HTTP. In that case
+        POSITION_UNAVAILABLE is returned without asking the API layer.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
+        (testWebViewGeolocationPermissionRequests): Keep the HTTP case to check that it indeed returns
+        POSITION_UNAVAILABLE and use HTTPS URLs to check permission requests are allowed or denied. Also stop using the
+        document title, and use user script messages that are more reliable instead.
+
 2016-05-28  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp

@@ -226 +226 @@
     }
 
+    static void permissionResultMessageReceivedCallback(WebKitUserContentManager* userContentManager, WebKitJavascriptResult* javascriptResult, UIClientTest* test)
+    {
+        test->m_permissionResult.reset(WebViewTest::javascriptResultToCString(javascriptResult));
+        g_main_loop_quit(test->m_mainLoop);
+    }
+
     UIClientTest()
-        : m_scriptDialogType(WEBKIT_SCRIPT_DIALOG_ALERT)
+        : WebViewTest(webkit_user_content_manager_new())
+        , m_scriptDialogType(WEBKIT_SCRIPT_DIALOG_ALERT)
         , m_scriptDialogConfirmed(true)
         , m_allowPermissionRequests(false)
@@ -240 +247 @@
         g_signal_connect(m_webView, "mouse-target-changed", G_CALLBACK(mouseTargetChanged), this);
         g_signal_connect(m_webView, "permission-request", G_CALLBACK(permissionRequested), this);
+        WebKitUserContentManager* manager = webkit_web_view_get_user_content_manager(m_webView);
+        webkit_user_content_manager_register_script_message_handler(manager, "permission");
+        g_signal_connect(manager, "script-message-received::permission", G_CALLBACK(permissionResultMessageReceivedCallback), this);
     }
 
@@ -245 +255 @@
     {
         g_signal_handlers_disconnect_matched(m_webView, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, this);
+        WebKitUserContentManager* manager = webkit_web_view_get_user_content_manager(m_webView);
+        g_signal_handlers_disconnect_matched(manager, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, this);
+        webkit_user_content_manager_unregister_script_message_handler(manager, "permission");
     }
 
@@ -268 +281 @@
     {
         g_main_loop_run(m_mainLoop);
+    }
+
+    const char* waitUntilPermissionResultMessageReceived()
+    {
+        m_permissionResult = nullptr;
+        g_main_loop_run(m_mainLoop);
+        return m_permissionResult.get();
     }
 
@@ -337 +357 @@
     GRefPtr<WebKitHitTestResult> m_mouseTargetHitTestResult;
     unsigned m_mouseTargetModifiers;
+    GUniquePtr<char> m_permissionResult;
 };
 
@@ -723 +744 @@
         "  function runTest()"
         "  {"
-        "    navigator.geolocation.getCurrentPosition(function(p) { document.title = \"OK\" },"
-        "                                             function(e) { document.title = e.code });"
+        "    navigator.geolocation.getCurrentPosition(function(p) { window.webkit.messageHandlers.permission.postMessage('OK'); },"
+        "                                             function(e) { window.webkit.messageHandlers.permission.postMessage(e.code.toString()); });"
         "  }"
         "  </script>"
@@ -730 +751 @@
         "</html>";
 
-    // Test denying a permission request.
+    // Geolocation is not allowed from insecure connections like HTTP,
+    // POSITION_UNAVAILABLE ('2') is returned in that case without even
+    // asking the API layer.
     test->m_allowPermissionRequests = false;
     test->loadHtml(geolocationRequestHTML, "http://foo.com/bar");
-    test->waitUntilTitleChanged();
-
-    // According to the Geolocation API specification, '1' is the
-    // error code returned for the PERMISSION_DENIED error.
-    // http://dev.w3.org/geo/api/spec-source.html#position_error_interface
-    const gchar* result = webkit_web_view_get_title(test->m_webView);
+    const gchar* result = test->waitUntilPermissionResultMessageReceived();
+    g_assert_cmpstr(result, ==, "2");
+
+    // Test denying a permission request. PERMISSION_DENIED ('1') is
+    // returned in this case.
+    test->m_allowPermissionRequests = false;
+    test->loadHtml(geolocationRequestHTML, "https://foo.com/bar");
+    result = test->waitUntilPermissionResultMessageReceived();
     g_assert_cmpstr(result, ==, "1");
 
-    // Test allowing a permission request.
+    // Test allowing a permission request. Result should be different
+    // to PERMISSION_DENIED ('1').
     test->m_allowPermissionRequests = true;
-    test->loadHtml(geolocationRequestHTML, 0);
-    test->waitUntilTitleChanged();
-
-    // Check that we did not get the PERMISSION_DENIED error now.
-    result = webkit_web_view_get_title(test->m_webView);
+    test->loadHtml(geolocationRequestHTML, "https://foo.com/bar");
+    result = test->waitUntilPermissionResultMessageReceived();
     g_assert_cmpstr(result, !=, "1");
     test->addLogFatalFlag(G_LOG_LEVEL_WARNING);