<!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>[199338] 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/199338">199338</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-11 23:53:54 -0700 (Mon, 11 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build MiniBrowser with CMake on Mac
https://bugs.webkit.org/show_bug.cgi?id=156471
Reviewed by Daniel Bates.
Source/WebKit2:
* DatabaseProcess/DatabaseProcess.messages.in:
Tools:
* CMakeLists.txt:
* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformWin.cmake:
* MiniBrowser/mac/CMakeLists.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessmessagesin">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in</a></li>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeCMakeListstxt">trunk/Tools/DumpRenderTree/CMakeLists.txt</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsMiniBrowsermacCMakeListstxt">trunk/Tools/MiniBrowser/mac/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199337 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Source/WebKit2/ChangeLog        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-11 Alex Christensen <achristensen@webkit.org>
+
+ Build MiniBrowser with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156471
+
+ Reviewed by Daniel Bates.
+
+ * DatabaseProcess/DatabaseProcess.messages.in:
+
</ins><span class="cx"> 2016-04-11 Ryuan Choi <ryuan.choi@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Do not pass context to EwkViewCreate
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in (199337 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in        2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx"> FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
</span><span class="cx"> DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><span class="cx"> DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> GrantSandboxExtensionsForBlobs(Vector<String> paths, WebKit::SandboxExtension::HandleArray extensions)
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (199337 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CMakeLists.txt        2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Tools/CMakeLists.txt        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> if (APPLE)
</span><span class="cx"> add_subdirectory(DumpRenderTree)
</span><span class="cx"> add_subdirectory(WebKitTestRunner)
</span><ins>+ add_subdirectory(MiniBrowser/mac)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199337 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Tools/ChangeLog        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-11 Alex Christensen <achristensen@webkit.org>
+
+ Build MiniBrowser with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156471
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * MiniBrowser/mac/CMakeLists.txt: Added.
+
</ins><span class="cx"> 2016-04-11 Ryuan Choi <ryuan.choi@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Do not pass context to EwkViewCreate
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (199337 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt        2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx">
</span><span class="cx"> set(DumpRenderTree_LIBRARIES
</span><span class="cx"> JavaScriptCore
</span><del>- WTF
</del><span class="cx"> WebCoreTestSupport
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (199337 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake        2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_LIBRARIES
</span><ins>+ WTF
</ins><span class="cx"> WebKit
</span><span class="cx"> shlwapi
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacCMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (0 => 199338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt         (rev 0)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt        2016-04-12 06:53:54 UTC (rev 199338)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/mac")
+
+#FIXME: This should not need WEBCORE_EXPORT defined. This means we are including WebCore headers, and we should not.
+add_definitions("-include MiniBrowser_Prefix.pch -DWEBCORE_EXPORT=")
+
+set(MiniBrowser_SOURCES
+ ${MINIBROWSER_DIR}/AppDelegate.m
+ ${MINIBROWSER_DIR}/BrowserWindowController.m
+ ${MINIBROWSER_DIR}/ExtensionManagerWindowController.m
+ ${MINIBROWSER_DIR}/SettingsController.m
+ ${MINIBROWSER_DIR}/WK1BrowserWindowController.m
+ ${MINIBROWSER_DIR}/WK2BrowserWindowController.m
+ ${MINIBROWSER_DIR}/main.m
+ ${TOOLS_DIR}/MiniBrowser/MBToolbarItem.m
+ ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugin.m
+)
+
+set(MiniBrowser_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/Source
+ ${DERIVED_SOURCES_DIR}
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ ${FORWARDING_HEADERS_DIR}
+ ${MINIBROWSER_DIR}
+)
+
+set(MiniBrowser_LIBRARIES
+ WebKit2
+)
+
+include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
</ins></span></pre>
</div>
</div>
</body>
</html>