Changeset 233576 in webkit

Timestamp:

Jul 6, 2018, 3:51:33 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK][WPE] REGRESSION(r233111): Test /webkit/WebKitUserContentManager/script-message-received fails
​https://bugs.webkit.org/show_bug.cgi?id=187383

Reviewed by Žan Doberšek.

This is actually a problem in the test itself. The problem is that we run js, connect to message-received and
quite the main loop when the message is received, which happens before the run js operation has been
completed. The test finishes early and since r233111 an IPC message is still pending (I guess the run js
callback) and the web page is still protected. Just adding a run loop operation before finishing the test would
fix it. We should wait for the js run to complete, instead of the message.

• TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp:

(UserScriptMessageTest::scriptMessageReceived):
(UserScriptMessageTest::waitUntilMessageReceived):
(UserScriptMessageTest::runJavaScriptFinished):
(UserScriptMessageTest::postMessageAndWaitUntilReceived):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-07-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] REGRESSION(r233111): Test /webkit/WebKitUserContentManager/script-message-received fails
+        https://bugs.webkit.org/show_bug.cgi?id=187383
+
+        Reviewed by Žan Doberšek.
+
+        This is actually a problem in the test itself. The problem is that we run js, connect to message-received and
+        quite the main loop when the message is received, which happens before the run js operation has been
+        completed. The test finishes early and since r233111 an IPC message is still pending (I guess the run js
+        callback) and the web page is still protected. Just adding a run loop operation before finishing the test would
+        fix it. We should wait for the js run to complete, instead of the message.
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp:
+        (UserScriptMessageTest::scriptMessageReceived):
+        (UserScriptMessageTest::waitUntilMessageReceived):
+        (UserScriptMessageTest::runJavaScriptFinished):
+        (UserScriptMessageTest::postMessageAndWaitUntilReceived):
+
 2018-07-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp

@@ -223 +223 @@
     {
         g_signal_handlers_disconnect_by_func(userContentManager, reinterpret_cast<gpointer>(scriptMessageReceived), test);
-        g_main_loop_quit(test->m_mainLoop);
+        if (!test->m_waitForScriptRun)
+            g_main_loop_quit(test->m_mainLoop);
 
         g_assert(!test->m_userScriptMessage);
@@ -240 +241 @@
 
         g_main_loop_run(m_mainLoop);
+        g_assert(!m_waitForScriptRun);
         g_assert(m_userScriptMessage);
         return m_userScriptMessage;
     }
 
+    static void runJavaScriptFinished(GObject*, GAsyncResult* result, UserScriptMessageTest* test)
+    {
+        g_assert(test->m_waitForScriptRun);
+        test->m_waitForScriptRun = false;
+        g_main_loop_quit(test->m_mainLoop);
+    }
+
     WebKitJavascriptResult* postMessageAndWaitUntilReceived(const char* handlerName, const char* javascriptValueAsText)
     {
         GUniquePtr<char> javascriptSnippet(g_strdup_printf("window.webkit.messageHandlers.%s.postMessage(%s);", handlerName, javascriptValueAsText));
-        webkit_web_view_run_javascript(m_webView, javascriptSnippet.get(), nullptr, nullptr, nullptr);
+        m_waitForScriptRun = true;
+        webkit_web_view_run_javascript(m_webView, javascriptSnippet.get(), nullptr, reinterpret_cast<GAsyncReadyCallback>(runJavaScriptFinished), this);
         return waitUntilMessageReceived(handlerName);
     }
@@ -253 +263 @@
 private:
     WebKitJavascriptResult* m_userScriptMessage;
+    bool m_waitForScriptRun { false };
 };