<!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>[162536] 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/162536">162536</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-22 11:00:48 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMake] Add support for building the NetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=127195
Reviewed by Daniel Bates.
.:
* Source/cmake/OptionsGTK.cmake: Turn on the network process and give it
a name like the WebProcess.
Source/WebKit2:
* CMakeLists.txt: Add shared network process build instructions.
* PlatformEfl.cmake: Move build instructions to the platform-independent file.
* PlatformGTK.cmake: Add some files to the source lists.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (162535 => 162536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-22 18:59:26 UTC (rev 162535)
+++ trunk/ChangeLog 2014-01-22 19:00:48 UTC (rev 162536)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-22 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Add support for building the NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=127195
+
+ Reviewed by Daniel Bates.
+
+ * Source/cmake/OptionsGTK.cmake: Turn on the network process and give it
+ a name like the WebProcess.
+
</ins><span class="cx"> 2014-01-20 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] Remove Nix from CMake scripts
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (162535 => 162536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-01-22 18:59:26 UTC (rev 162535)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-01-22 19:00:48 UTC (rev 162536)
</span><span class="lines">@@ -674,6 +674,10 @@
</span><span class="cx"> WebKit2
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+set(NetworkProcess_LIBRARIES
+ WebKit2
+)
+
</ins><span class="cx"> set(WebKit2_LIBRARIES
</span><span class="cx"> JavaScriptCore
</span><span class="cx"> WTF
</span><span class="lines">@@ -713,6 +717,17 @@
</span><span class="cx"> set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_NETWORK_PROCESS)
+ add_executable(NetworkProcess ${NetworkProcess_SOURCES})
+ target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
+ set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
+ install(TARGETS NetworkProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
+
+ if (WebKit2_NetworkProcess_OUTPUT_NAME)
+ set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
+ endif ()
+endif ()
+
</ins><span class="cx"> POPULATE_LIBRARY_VERSION(WEBKIT2)
</span><span class="cx"> set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162535 => 162536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-22 18:59:26 UTC (rev 162535)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-22 19:00:48 UTC (rev 162536)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-22 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Add support for building the NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=127195
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt: Add shared network process build instructions.
+ * PlatformEfl.cmake: Move build instructions to the platform-independent file.
+ * PlatformGTK.cmake: Add some files to the source lists.
+
</ins><span class="cx"> 2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r162441): [GTK] ResourceLoader is broken when there aren't user extensions
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (162535 => 162536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-01-22 18:59:26 UTC (rev 162535)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-01-22 19:00:48 UTC (rev 162536)
</span><span class="lines">@@ -400,27 +400,6 @@
</span><span class="cx"> install(TARGETS PluginProcess DESTINATION "${EXEC_INSTALL_DIR}")
</span><span class="cx"> endif () # ENABLE_PLUGIN_PROCESS
</span><span class="cx">
</span><del>-if (ENABLE_NETWORK_PROCESS)
- set(NetworkProcess_EXECUTABLE_NAME NetworkProcess)
- list(APPEND NetworkProcess_INCLUDE_DIRECTORIES
- "${WEBKIT2_DIR}/NetworkProcess"
- )
-
- include_directories(${NetworkProcess_INCLUDE_DIRECTORIES})
-
- list(APPEND NetworkProcess_SOURCES
- ${WEBKIT2_DIR}/unix/NetworkMainUnix.cpp
- )
-
- set(NetworkProcess_LIBRARIES
- WebKit2
- )
-
- add_executable(${NetworkProcess_EXECUTABLE_NAME} ${NetworkProcess_SOURCES})
- target_link_libraries(${NetworkProcess_EXECUTABLE_NAME} ${NetworkProcess_LIBRARIES})
- install(TARGETS ${NetworkProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
-endif ()
-
</del><span class="cx"> include_directories(${THIRDPARTY_DIR}/gtest/include)
</span><span class="cx">
</span><span class="cx"> set(EWK2UnitTests_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (162535 => 162536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-22 18:59:26 UTC (rev 162535)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-22 19:00:48 UTC (rev 162536)
</span><span class="lines">@@ -18,6 +18,12 @@
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
</span><span class="cx">
</span><ins>+ NetworkProcess/soup/NetworkProcessSoup.cpp
+ NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
+ NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
+
+ NetworkProcess/unix/NetworkProcessMainUnix.cpp
+
</ins><span class="cx"> Platform/IPC/unix/AttachmentUnix.cpp
</span><span class="cx"> Platform/IPC/unix/ConnectionUnix.cpp
</span><span class="cx">
</span><span class="lines">@@ -260,6 +266,8 @@
</span><span class="cx"> UIProcess/gtk/WebPreferencesGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebProcessProxyGtk.cpp
</span><span class="cx">
</span><ins>+ UIProcess/Network/soup/NetworkProcessProxySoup.cpp
+ UIProcess/soup/WebContextSoup.cpp
</ins><span class="cx"> UIProcess/soup/WebCookieManagerProxySoup.cpp
</span><span class="cx"> UIProcess/soup/WebSoupRequestManagerClient.cpp
</span><span class="cx"> UIProcess/soup/WebSoupRequestManagerProxy.cpp
</span><span class="lines">@@ -396,6 +404,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Downloads/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/soup"
</span><ins>+ "${WEBKIT2_DIR}/NetworkProcess/unix"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C/soup"
</span><span class="lines">@@ -431,6 +440,10 @@
</span><span class="cx"> gtk/MainGtk.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND NetworkProcess_SOURCES
+ unix/NetworkMainUnix.cpp
+)
+
</ins><span class="cx"> set(SharedWebKit2Libraries
</span><span class="cx"> ${WebKit2_LIBRARIES}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (162535 => 162536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-22 18:59:26 UTC (rev 162535)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-22 19:00:48 UTC (rev 162536)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF)
</span><span class="cx">
</span><span class="cx"> # FIXME: Perhaps we need a more generic way of defining dependencies between features.
</span><span class="lines">@@ -119,6 +120,7 @@
</span><span class="cx"> set(WebKit_OUTPUT_NAME webkitgtk-3.0)
</span><span class="cx"> set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
</span><span class="cx"> set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
</span><ins>+set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
</ins><span class="cx">
</span><span class="cx"> set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
</span><span class="cx"> set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-3.0")
</span></span></pre>
</div>
</div>
</body>
</html>