Title: [199338] trunk
- Revision
- 199338
- Author
- achristen...@apple.com
- Date
- 2016-04-11 23:53:54 -0700 (Mon, 11 Apr 2016)
Log Message
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.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199337 => 199338)
--- 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)
@@ -1,3 +1,12 @@
+2016-04-11 Alex Christensen <achristen...@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:
+
2016-04-11 Ryuan Choi <ryuan.c...@navercorp.com>
[EFL] Do not pass context to EwkViewCreate
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in (199337 => 199338)
--- 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)
@@ -32,7 +32,9 @@
FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
+#if ENABLE(INDEXED_DATABASE)
GrantSandboxExtensionsForBlobs(Vector<String> paths, WebKit::SandboxExtension::HandleArray extensions)
+#endif
}
#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Tools/CMakeLists.txt (199337 => 199338)
--- 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)
@@ -38,6 +38,7 @@
if (APPLE)
add_subdirectory(DumpRenderTree)
add_subdirectory(WebKitTestRunner)
+ add_subdirectory(MiniBrowser/mac)
endif ()
if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
Modified: trunk/Tools/ChangeLog (199337 => 199338)
--- trunk/Tools/ChangeLog 2016-04-12 06:16:21 UTC (rev 199337)
+++ trunk/Tools/ChangeLog 2016-04-12 06:53:54 UTC (rev 199338)
@@ -1,3 +1,15 @@
+2016-04-11 Alex Christensen <achristen...@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.
+
2016-04-11 Ryuan Choi <ryuan.c...@navercorp.com>
[EFL] Do not pass context to EwkViewCreate
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (199337 => 199338)
--- 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)
@@ -13,7 +13,6 @@
set(DumpRenderTree_LIBRARIES
_javascript_Core
- WTF
WebCoreTestSupport
)
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (199337 => 199338)
--- 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)
@@ -79,6 +79,7 @@
)
list(APPEND DumpRenderTree_LIBRARIES
+ WTF
WebKit
shlwapi
)
Added: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (0 => 199338)
--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt (rev 0)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-04-12 06:53:54 UTC (rev 199338)
@@ -0,0 +1,33 @@
+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})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
