<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176393] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176393">176393</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-20 04:46:15 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Provide convenience API in DOM bindings to post messages to user message handlers
https://bugs.webkit.org/show_bug.cgi?id=138871
Patch by Adrian Perez de Castro <aperez@igalia.com> on 2014-11-20
Reviewed by Carlos Garcia Campos.
Source/WebCore:
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.
Tools:
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMCustomcpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMCustomh">trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMCustomsymbols">trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectwebkitdomsymbols">trunk/Source/WebCore/bindings/gobject/webkitdom.symbols</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitUserContentManagercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-20 Adrian Perez de Castro <aperez@igalia.com>
+
+ [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.
+
</ins><span class="cx"> 2014-11-12 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Replace the usage of size_t by unsigned
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #include "WebKitDOMCustom.h"
</span><span class="cx">
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><ins>+#include "SerializedScriptValue.h"
</ins><span class="cx"> #include "WebKitDOMDOMWindowPrivate.h"
</span><span class="cx"> #include "WebKitDOMHTMLInputElement.h"
</span><span class="cx"> #include "WebKitDOMHTMLInputElementPrivate.h"
</span><span class="lines">@@ -64,3 +65,25 @@
</span><span class="cx"> return kit(core(handlersNamespace)->handler(String::fromUTF8(name), WebCore::mainThreadNormalWorld()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,6 +41,18 @@
</span><span class="cx"> */
</span><span class="cx"> WEBKIT_API gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement* input);
</span><span class="cx">
</span><ins>+/**
+ * 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);
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMCustomsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,2 +1,3 @@
</span><span class="cx"> gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElement*)
</span><span class="cx"> gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*)
</span><ins>+gboolean webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow*, const gchar*, const gchar*)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectwebkitdomsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> WebKitDOMCSSStyleSheet* webkit_dom_dom_implementation_create_css_style_sheet(WebKitDOMDOMImplementation*, const gchar*, const gchar*, GError**)
</span><span class="cx"> WebKitDOMHTMLDocument* webkit_dom_dom_implementation_create_html_document(WebKitDOMDOMImplementation*, const gchar*)
</span><span class="cx"> GType webkit_dom_dom_window_get_type(void)
</span><ins>+gboolean webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow*, const gchar*, const gchar*)
</ins><span class="cx"> GType webkit_dom_document_get_type(void)
</span><span class="cx"> WebKitDOMDocumentType* webkit_dom_document_get_doctype(WebKitDOMDocument*)
</span><span class="cx"> WebKitDOMHTMLCollection* webkit_dom_document_get_images(WebKitDOMDocument*)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-20 11:01:57 UTC (rev 176392)
+++ trunk/Tools/ChangeLog 2014-11-20 12:46:15 UTC (rev 176393)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-20 Adrian Perez de Castro <aperez@igalia.com>
+
+ [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):
+
</ins><span class="cx"> 2014-11-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Work around the fact that different masters may have different names for their codebases.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitUserContentManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -349,13 +349,23 @@
</span><span class="cx"> {
</span><span class="cx"> g_assert(test->registerHandler("dom"));
</span><span class="cx">
</span><del>- test->loadHtml("<html></html>", nullptr);
</del><ins>+ test->loadHtml("<html>1</html>", nullptr);
</ins><span class="cx"> WebKitJavascriptResult* javascriptResult = test->waitUntilMessageReceived("dom");
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</span><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "DocumentLoaded");
</span><span class="cx">
</span><span class="cx"> test->unregisterHandler("dom");
</span><ins>+
+ g_assert(test->registerHandler("dom-convenience"));
+
+ test->loadHtml("<html>2</html>", nullptr);
+ javascriptResult = test->waitUntilMessageReceived("dom-convenience");
+ g_assert(javascriptResult);
+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
+ g_assert_cmpstr(valueString.get(), ==, "DocumentLoaded");
+
+ test->unregisterHandler("dom-convenience");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (176392 => 176393)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> webkit_dom_user_message_handler_post_message(handler, "DocumentLoaded");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ webkit_dom_dom_window_webkit_message_handlers_post_message(window, "dom-convenience", "DocumentLoaded");
</ins><span class="cx">
</span><span class="cx"> gpointer data = g_object_get_data(G_OBJECT(extension), "dbus-connection");
</span><span class="cx"> if (data)
</span></span></pre>
</div>
</div>
</body>
</html>