<!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>[218331] 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/218331">218331</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-06-15 08:37:31 -0700 (Thu, 15 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Do not use the C API in WebGtkExtensionManager
https://bugs.webkit.org/show_bug.cgi?id=173408

Reviewed by Michael Catanzaro.

.:

Update exported symbol signature.

* Source/cmake/gtksymbols.filter:

Source/WebKit2:

Use the C++ API instead.

* WebProcess/gtk/WebGtkExtensionManager.cpp:
(WebKit::parseUserData):
(WebKit::WebGtkExtensionManager::initialize):
* WebProcess/gtk/WebGtkExtensionManager.h:
* WebProcess/gtk/WebGtkInjectedBundleMain.cpp:
(WKBundleInitialize):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkInjectedBundleMaincpp">trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp</a></li>
<li><a href="#trunkSourcecmakegtksymbolsfilter">trunk/Source/cmake/gtksymbols.filter</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (218330 => 218331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog  2017-06-15 15:15:03 UTC (rev 218330)
+++ trunk/ChangeLog     2017-06-15 15:37:31 UTC (rev 218331)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Do not use the C API in WebGtkExtensionManager
+        https://bugs.webkit.org/show_bug.cgi?id=173408
+
+        Reviewed by Michael Catanzaro.
+
+        Update exported symbol signature.
+
+        * Source/cmake/gtksymbols.filter:
+
</ins><span class="cx"> 2017-06-09  Zan Dobersek  <zdobersek@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE] Enable ENCRYPTED_MEDIA for build-webkit builds
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (218330 => 218331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog   2017-06-15 15:15:03 UTC (rev 218330)
+++ trunk/Source/WebKit2/ChangeLog      2017-06-15 15:37:31 UTC (rev 218331)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Do not use the C API in WebGtkExtensionManager
+        https://bugs.webkit.org/show_bug.cgi?id=173408
+
+        Reviewed by Michael Catanzaro.
+
+        Use the C++ API instead.
+
+        * WebProcess/gtk/WebGtkExtensionManager.cpp:
+        (WebKit::parseUserData):
+        (WebKit::WebGtkExtensionManager::initialize):
+        * WebProcess/gtk/WebGtkExtensionManager.h:
+        * WebProcess/gtk/WebGtkInjectedBundleMain.cpp:
+        (WKBundleInitialize):
+
</ins><span class="cx"> 2017-06-15  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] Stop using GtkAction in WebPopupMenuProxyGtk
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp (218330 => 218331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp   2017-06-15 15:15:03 UTC (rev 218330)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp      2017-06-15 15:37:31 UTC (rev 218331)
</span><span class="lines">@@ -20,11 +20,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebGtkExtensionManager.h"
</span><span class="cx"> 
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "InjectedBundle.h"
</span><del>-#include "WKBundleAPICast.h"
-#include "WKDictionary.h"
-#include "WKString.h"
-#include "WKType.h"
</del><span class="cx"> #include "WebKitWebExtensionPrivate.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <memory>
</span><span class="lines">@@ -51,12 +48,11 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void parseUserData(WKTypeRef userData, String& webExtensionsDirectory, GRefPtr<GVariant>& initializationUserData)
</del><ins>+static void parseUserData(API::Object* userData, String& webExtensionsDirectory, GRefPtr<GVariant>& initializationUserData)
</ins><span class="cx"> {
</span><del>-    ASSERT(userData);
-    ASSERT(WKGetTypeID(userData) == WKStringGetTypeID());
</del><ins>+    ASSERT(userData->type() == API::Object::Type::String);
</ins><span class="cx"> 
</span><del>-    CString userDataString = toImpl(static_cast<WKStringRef>(userData))->string().utf8();
</del><ins>+    CString userDataString = static_cast<API::String*>(userData)->string().utf8();
</ins><span class="cx">     GRefPtr<GVariant> variant = g_variant_parse(nullptr, userDataString.data(),
</span><span class="cx">         userDataString.data() + userDataString.length(), nullptr, nullptr);
</span><span class="cx"> 
</span><span class="lines">@@ -90,13 +86,15 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebGtkExtensionManager::initialize(WKBundleRef bundle, WKTypeRef userDataString)
</del><ins>+void WebGtkExtensionManager::initialize(InjectedBundle* bundle, API::Object* userDataObject)
</ins><span class="cx"> {
</span><del>-    m_extension = adoptGRef(webkitWebExtensionCreate(toImpl(bundle)));
</del><ins>+    ASSERT(bundle);
+    ASSERT(userDataObject);
+    m_extension = adoptGRef(webkitWebExtensionCreate(bundle));
</ins><span class="cx"> 
</span><span class="cx">     String webExtensionsDirectory;
</span><span class="cx">     GRefPtr<GVariant> userData;
</span><del>-    parseUserData(userDataString, webExtensionsDirectory, userData);
</del><ins>+    parseUserData(userDataObject, webExtensionsDirectory, userData);
</ins><span class="cx"> 
</span><span class="cx">     if (webExtensionsDirectory.isNull())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h (218330 => 218331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h     2017-06-15 15:15:03 UTC (rev 218330)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h        2017-06-15 15:37:31 UTC (rev 218331)
</span><span class="lines">@@ -17,11 +17,9 @@
</span><span class="cx">  * Boston, MA 02110-1301, USA.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef WebGtkExtensionManager_h
-#define WebGtkExtensionManager_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><span class="cx"> #include "Module.h"
</span><del>-#include "WKBundle.h"
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -29,19 +27,21 @@
</span><span class="cx"> 
</span><span class="cx"> typedef struct _WebKitWebExtension WebKitWebExtension;
</span><span class="cx"> 
</span><del>-namespace WTF {
-class String;
</del><ins>+namespace API {
+class Object;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><ins>+class InjectedBundle;
+
</ins><span class="cx"> class WebGtkExtensionManager {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(WebGtkExtensionManager);
</span><span class="cx"> 
</span><span class="cx"> public:
</span><del>-    WK_EXPORT static WebGtkExtensionManager& singleton();
</del><ins>+    static WebGtkExtensionManager& singleton();
</ins><span class="cx"> 
</span><del>-    WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
</del><ins>+    void initialize(InjectedBundle*, API::Object*);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     WebGtkExtensionManager();
</span><span class="lines">@@ -56,5 +56,3 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebGtkExtensionManager_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkInjectedBundleMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp (218330 => 218331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp 2017-06-15 15:15:03 UTC (rev 218330)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp    2017-06-15 15:37:31 UTC (rev 218331)
</span><span class="lines">@@ -19,7 +19,9 @@
</span><span class="cx"> 
</span><span class="cx"> #include "config.h"
</span><span class="cx"> 
</span><ins>+#include "InjectedBundle.h"
</ins><span class="cx"> #include "WebGtkExtensionManager.h"
</span><ins>+#include <WebKit/WKBundleAPICast.h>
</ins><span class="cx"> #include <WebKit/WKBundleInitialize.h>
</span><span class="cx"> 
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -31,5 +33,5 @@
</span><span class="cx"> #endif
</span><span class="cx"> void WKBundleInitialize(WKBundleRef bundle, WKTypeRef userData)
</span><span class="cx"> {
</span><del>-    WebGtkExtensionManager::singleton().initialize(bundle, userData);
</del><ins>+    WebGtkExtensionManager::singleton().initialize(toImpl(bundle), toImpl(userData));
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcecmakegtksymbolsfilter"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/gtksymbols.filter (218330 => 218331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/gtksymbols.filter     2017-06-15 15:15:03 UTC (rev 218330)
+++ trunk/Source/cmake/gtksymbols.filter        2017-06-15 15:37:31 UTC (rev 218331)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">   NetworkProcessMainUnix;
</span><span class="cx">   PluginProcessMainUnix;
</span><span class="cx">   DatabaseProcessMainUnix;
</span><del>-  _ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv;
</del><ins>+  _ZN6WebKit22WebGtkExtensionManager10initializeEPNS_14InjectedBundleEPN3API6ObjectE;
</ins><span class="cx">   _ZN6WebKit22WebGtkExtensionManager9singletonEv;
</span><span class="cx"> local:
</span><span class="cx">   webkit_media_player_debug;
</span></span></pre>
</div>
</div>

</body>
</html>