Diff
Modified: trunk/Source/WebCore/ChangeLog (176392 => 176393)
--- trunk/Source/WebCore/ChangeLog 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Source/WebCore/ChangeLog 2014-11-20 12:46:15 UTC (rev 176393)
@@ -1,3 +1,21 @@
+2014-11-20 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Provide convenience API in DOM bindings to post messages to user message handlers
+ https://bugs.webkit.org/show_bug.cgi?id=138871
+
+ Reviewed by Carlos Garcia Campos.
+
+ Adds a convenience function in the WebKitGTK+ DOM bindings to post
+ messages to user message handlers in a way convenient way more
+ convenient than using the autogenerated bindings.
+
+ * bindings/gobject/WebKitDOMCustom.cpp:
+ (webkit_dom_dom_window_webkit_message_handlers_post_message):
+ Added new convenience API function to post messages to user message
+ handlers.
+ * bindings/gobject/WebKitDOMCustom.h: Ditto.
+ * bindings/gobject/WebKitDOMCustom.symbols: Ditto.
+
2014-11-12 Sergio Villar Senin <[email protected]>
[CSS Grid Layout] Replace the usage of size_t by unsigned
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp (176392 => 176393)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2014-11-20 12:46:15 UTC (rev 176393)
@@ -20,6 +20,7 @@
#include "WebKitDOMCustom.h"
#include "JSMainThreadExecState.h"
+#include "SerializedScriptValue.h"
#include "WebKitDOMDOMWindowPrivate.h"
#include "WebKitDOMHTMLInputElement.h"
#include "WebKitDOMHTMLInputElementPrivate.h"
@@ -64,3 +65,25 @@
return kit(core(handlersNamespace)->handler(String::fromUTF8(name), WebCore::mainThreadNormalWorld()));
}
+gboolean webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow* window, const gchar* handlerName, const gchar* message)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_DOM_WINDOW(window), FALSE);
+ g_return_val_if_fail(handlerName, FALSE);
+ g_return_val_if_fail(message, FALSE);
+
+ WebCore::DOMWindow* domWindow = core(window);
+ if (!domWindow->shouldHaveWebKitNamespaceForWorld(WebCore::mainThreadNormalWorld()))
+ return FALSE;
+
+ auto webkitNamespace = domWindow->webkitNamespace();
+ if (!webkitNamespace)
+ return FALSE;
+
+ auto handler = webkitNamespace->messageHandlers()->handler(String::fromUTF8(handlerName), WebCore::mainThreadNormalWorld());
+ if (!handler)
+ return FALSE;
+
+ WebCore::JSMainThreadNullState state;
+ handler->postMessage(WebCore::SerializedScriptValue::create(String::fromUTF8(message)));
+ return TRUE;
+}
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h (176392 => 176393)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h 2014-11-20 12:46:15 UTC (rev 176393)
@@ -41,6 +41,18 @@
*/
WEBKIT_API gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement* input);
+/**
+ * webkit_dom_dom_window_post_user_message:
+ * @window: A #WebKitDOMDOMWindow
+ * @handler: Name of the user message handler.
+ * @message: _javascript_ value to be sent.
+ *
+ * Returns: Whether the message was successfully sent.
+ *
+ * Since: 2.8
+ */
+gboolean webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow* window, const gchar* handler, const gchar* message);
+
G_END_DECLS
#endif
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols (176392 => 176393)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols 2014-11-20 12:46:15 UTC (rev 176393)
@@ -1,2 +1,3 @@
gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElement*)
gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*)
+gboolean webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow*, const gchar*, const gchar*)
Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (176392 => 176393)
--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2014-11-20 12:46:15 UTC (rev 176393)
@@ -22,6 +22,7 @@
WebKitDOMCSSStyleSheet* webkit_dom_dom_implementation_create_css_style_sheet(WebKitDOMDOMImplementation*, const gchar*, const gchar*, GError**)
WebKitDOMHTMLDocument* webkit_dom_dom_implementation_create_html_document(WebKitDOMDOMImplementation*, const gchar*)
GType webkit_dom_dom_window_get_type(void)
+gboolean webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow*, const gchar*, const gchar*)
GType webkit_dom_document_get_type(void)
WebKitDOMDocumentType* webkit_dom_document_get_doctype(WebKitDOMDocument*)
WebKitDOMHTMLCollection* webkit_dom_document_get_images(WebKitDOMDocument*)
Modified: trunk/Tools/ChangeLog (176392 => 176393)
--- trunk/Tools/ChangeLog 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Tools/ChangeLog 2014-11-20 12:46:15 UTC (rev 176393)
@@ -1,3 +1,19 @@
+2014-11-20 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Provide convenience API in DOM bindings to post messages to user message handlers
+ https://bugs.webkit.org/show_bug.cgi?id=138871
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add a test case for the convenience API for posting user messages
+ added to the DOM bindings.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:
+ (testUserContentManagerMessageFromConvenienceDOMBindings):
+ (beforeAll):
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ (documentLoadedCallback):
+
2014-11-19 Dana Burkart <[email protected]>
Work around the fact that different masters may have different names for their codebases.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp (176392 => 176393)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp 2014-11-20 12:46:15 UTC (rev 176393)
@@ -349,13 +349,23 @@
{
g_assert(test->registerHandler("dom"));
- test->loadHtml("<html></html>", nullptr);
+ test->loadHtml("<html>1</html>", nullptr);
WebKitJavascriptResult* _javascript_Result = test->waitUntilMessageReceived("dom");
g_assert(_javascript_Result);
GUniquePtr<char> valueString(WebViewTest::_javascript_ResultToCString(_javascript_Result));
g_assert_cmpstr(valueString.get(), ==, "DocumentLoaded");
test->unregisterHandler("dom");
+
+ g_assert(test->registerHandler("dom-convenience"));
+
+ test->loadHtml("<html>2</html>", nullptr);
+ _javascript_Result = test->waitUntilMessageReceived("dom-convenience");
+ g_assert(_javascript_Result);
+ valueString.reset(WebViewTest::_javascript_ResultToCString(_javascript_Result));
+ g_assert_cmpstr(valueString.get(), ==, "DocumentLoaded");
+
+ test->unregisterHandler("dom-convenience");
}
static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (176392 => 176393)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-11-20 12:46:15 UTC (rev 176393)
@@ -109,6 +109,7 @@
webkit_dom_user_message_handler_post_message(handler, "DocumentLoaded");
}
+ webkit_dom_dom_window_webkit_message_handlers_post_message(window, "dom-convenience", "DocumentLoaded");
gpointer data = "" "dbus-connection");
if (data)
