Title: [199033] trunk/Source/WebKit2
- Revision
- 199033
- Author
- mcatanz...@igalia.com
- Date
- 2016-04-04 17:19:28 -0700 (Mon, 04 Apr 2016)
Log Message
Unreviewed GTK build fix after r199020
* UIProcess/API/gtk/WebKitUserContentManager.cpp:
(webkit_user_content_manager_register_script_message_handler):
(webkit_user_content_manager_unregister_script_message_handler):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199032 => 199033)
--- trunk/Source/WebKit2/ChangeLog 2016-04-05 00:14:30 UTC (rev 199032)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-05 00:19:28 UTC (rev 199033)
@@ -1,3 +1,11 @@
+2016-04-04 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed GTK build fix after r199020
+
+ * UIProcess/API/gtk/WebKitUserContentManager.cpp:
+ (webkit_user_content_manager_register_script_message_handler):
+ (webkit_user_content_manager_unregister_script_message_handler):
+
2016-04-04 Alex Christensen <achristen...@webkit.org>
CMake build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp (199032 => 199033)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2016-04-05 00:14:30 UTC (rev 199032)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2016-04-05 00:19:28 UTC (rev 199033)
@@ -232,8 +232,8 @@
g_return_val_if_fail(WEBKIT_IS_USER_CONTENT_MANAGER(manager), FALSE);
g_return_val_if_fail(name, FALSE);
- RefPtr<WebScriptMessageHandler> handler =
- WebScriptMessageHandler::create(std::make_unique<ScriptMessageClientGtk>(manager, name), String::fromUTF8(name));
+ Ref<WebScriptMessageHandler> handler =
+ WebScriptMessageHandler::create(std::make_unique<ScriptMessageClientGtk>(manager, name), String::fromUTF8(name), API::UserContentWorld::normalWorld());
return manager->priv->userContentController->addUserScriptMessageHandler(handler.get());
}
@@ -257,7 +257,7 @@
{
g_return_if_fail(WEBKIT_IS_USER_CONTENT_MANAGER(manager));
g_return_if_fail(name);
- manager->priv->userContentController->removeUserMessageHandlerForName(String::fromUTF8(name));
+ manager->priv->userContentController->removeUserMessageHandlerForName(String::fromUTF8(name), API::UserContentWorld::normalWorld());
}
WebUserContentControllerProxy* webkitUserContentManagerGetUserContentControllerProxy(WebKitUserContentManager* manager)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes