<!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>[160368] trunk/Source/WebKit2</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/160368">160368</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-10 08:43:25 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] Add support for building the WebKit injected bundle
https://bugs.webkit.org/show_bug.cgi?id=116373
Reviewed by Gustavo Noronha Silva.
* PlatformGTK.cmake: Add support for building the InjectedBundle and link the WebKit2
shared library against the GObject DOM bindings.
* WebProcess/gtk/WebGtkExtensionManager.h: Properly export symbols used by the InjectedBundle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160367 => 160368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-10 16:41:41 UTC (rev 160367)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 16:43:25 UTC (rev 160368)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-10 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building the WebKit injected bundle
+ https://bugs.webkit.org/show_bug.cgi?id=116373
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Add support for building the InjectedBundle and link the WebKit2
+ shared library against the GObject DOM bindings.
+ * WebProcess/gtk/WebGtkExtensionManager.h: Properly export symbols used by the InjectedBundle.
+
</ins><span class="cx"> 2013-12-10 Kwang Yul Seo <skyul@company100.net>
</span><span class="cx">
</span><span class="cx"> [WK2][SOUP] WebContext::setIgnoreTLSErrors should send SetIgnoreTLSErrors to the network process when network process is enabled
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160367 => 160368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-10 16:41:41 UTC (rev 160367)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-10 16:43:25 UTC (rev 160368)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
</ins><span class="cx"> set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
</span><span class="cx"> set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
</span><span class="cx"> set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
</span><span class="lines">@@ -363,6 +364,7 @@
</span><span class="cx"> # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
</span><span class="cx"> list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
</span><span class="cx"> "${WEBKIT2_FORWARDING_HEADERS_DIR}"
</span><ins>+ "${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension"
</ins><span class="cx"> "${WEBKIT2_BUILT_API_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT2GTK_DIR}"
</span><span class="cx"> )
</span><span class="lines">@@ -385,6 +387,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/soup"
</span><ins>+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk"
</ins><span class="cx"> "${WEBKIT2_DIR}/WebProcess/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/gtk"
</span><span class="lines">@@ -434,6 +437,11 @@
</span><span class="cx"> COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/gtk ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+add_custom_target(fake-installed-webextension-headers
+ mkdir -p ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension
+ COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension/webkit2
+)
+
</ins><span class="cx"> add_custom_target(gtk-forwarding-headers
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
</span><span class="cx"> )
</span><span class="lines">@@ -446,6 +454,7 @@
</span><span class="cx"> fake-installed-headers
</span><span class="cx"> gtk-forwarding-headers
</span><span class="cx"> soup-forwarding-headers
</span><ins>+ fake-installed-webextension-headers
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_PLUGIN_PROCESS)
</span><span class="lines">@@ -470,3 +479,23 @@
</span><span class="cx"> target_link_libraries(${PluginProcess_EXECUTABLE_NAME} ${PluginProcess_LIBRARIES})
</span><span class="cx"> install(TARGETS ${PluginProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
</span><span class="cx"> endif () # ENABLE_PLUGIN_PROCESS
</span><ins>+
+# Commands for building the built-in injected bundle.
+include_directories(
+ "${WEBKIT2_DIR}/Platform"
+ "${WEBKIT2_DIR}/Shared"
+ "${WEBKIT2_DIR}/Shared/API/c"
+ "${WEBKIT2_DIR}/UIProcess/API/C"
+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
+ "${DERIVED_SOURCES_DIR}"
+ "${DERIVED_SOURCES_DIR}/InjectedBundle"
+ "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
+ "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
+)
+
+add_library(webkit2gtkinjectedbundle MODULE
+ "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp"
+)
+add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
+list(APPEND WebKit2_LIBRARIES GObjectDOMBindings)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h (160367 => 160368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h 2013-12-10 16:41:41 UTC (rev 160367)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h 2013-12-10 16:43:25 UTC (rev 160368)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebGtkExtensionManager);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static WebGtkExtensionManager& shared();
</del><ins>+ WK_EXPORT static WebGtkExtensionManager& shared();
</ins><span class="cx">
</span><del>- void initialize(WKBundleRef, WKTypeRef);
</del><ins>+ WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebGtkExtensionManager();
</span></span></pre>
</div>
</div>
</body>
</html>