Title: [187860] releases/WebKitGTK/webkit-2.8/Tools
Revision
187860
Author
[email protected]
Date
2015-08-04 06:32:50 -0700 (Tue, 04 Aug 2015)

Log Message

Merge r187218 - Unregistering and re-registering a user message handler does not work
https://bugs.webkit.org/show_bug.cgi?id=138142

Reviewed by Martin Robinson.

This has probably been fixed in r184846, enable the test case
blocked on it.

* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:
(testUserContentManagerScriptMessageReceived):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.8/Tools/ChangeLog (187859 => 187860)


--- releases/WebKitGTK/webkit-2.8/Tools/ChangeLog	2015-08-04 13:26:32 UTC (rev 187859)
+++ releases/WebKitGTK/webkit-2.8/Tools/ChangeLog	2015-08-04 13:32:50 UTC (rev 187860)
@@ -1,3 +1,16 @@
+2015-07-23  Carlos Garcia Campos  <[email protected]>
+
+        Unregistering and re-registering a user message handler does not work
+        https://bugs.webkit.org/show_bug.cgi?id=138142
+
+        Reviewed by Martin Robinson.
+
+        This has probably been fixed in r184846, enable the test case
+        blocked on it.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:
+        (testUserContentManagerScriptMessageReceived):
+
 2015-07-08  Hyungwook Lee  <[email protected]>
 
         Fix ASSERTION FAILED: !m_pendingNavigationID in WebPage::reload().

Modified: releases/WebKitGTK/webkit-2.8/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp (187859 => 187860)


--- releases/WebKitGTK/webkit-2.8/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp	2015-08-04 13:26:32 UTC (rev 187859)
+++ releases/WebKitGTK/webkit-2.8/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp	2015-08-04 13:32:50 UTC (rev 187860)
@@ -328,19 +328,14 @@
     // Unregistering a handler and re-registering again under the same name should work.
     test->unregisterHandler("msg");
 
-    // FIXME: Enable after https://bugs.webkit.org/show_bug.cgi?id=138142 gets fixed.
-#if 0
     _javascript_Result = test->runJavaScriptAndWaitUntilFinished("window.webkit.messageHandlers.msg.postMessage('42');", &error.outPtr());
     g_assert(!_javascript_Result);
     g_assert(error.get());
 
     // Re-registering a handler that has been unregistered must work
     g_assert(test->registerHandler("msg"));
-    message = test->postMessageAndWaitUntilReceived("msg", "'handler: msg'");
-    valueString.reset(WebViewTest::_javascript_ResultToCString(message));
-    webkit_javascript_result_unref(message);
+    valueString.reset(WebViewTest::_javascript_ResultToCString(test->postMessageAndWaitUntilReceived("msg", "'handler: msg'")));
     g_assert_cmpstr(valueString.get(), ==, "handler: msg");
-#endif
 
     test->unregisterHandler("anotherHandler");
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to