Fix CMake build and make PluginProcess executable
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Nov 2015 02:10:35 +0000 (02:10 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Nov 2015 02:10:35 +0000 (02:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151332

Patch by Alex Christensen <achristensen@webkit.org> on 2015-11-16
Reviewed by Tim Horton.

.:

* Source/cmake/OptionsMac.cmake:

Source/WebKit2:

* PlatformMac.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformMac.cmake
Source/cmake/OptionsMac.cmake

index eef9453..6ea574a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build and make PluginProcess executable
+        https://bugs.webkit.org/show_bug.cgi?id=151332
+
+        Reviewed by Tim Horton.
+
+        * Source/cmake/OptionsMac.cmake:
+
 2015-11-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Use FTL by default when LLVM 3.7 is available
index f034ff4..1061880 100644 (file)
@@ -1,3 +1,12 @@
+2015-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build and make PluginProcess executable
+        https://bugs.webkit.org/show_bug.cgi?id=151332
+
+        Reviewed by Tim Horton.
+
+        * PlatformMac.cmake:
+
 2015-11-16  Tim Horton  <timothy_horton@apple.com>
 
         Multi-WKWebView find completes after the first view
index c91e285..000d7f0 100644 (file)
@@ -16,6 +16,7 @@ list(APPEND WebKit2_SOURCES
     NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
 
     NetworkProcess/cocoa/NetworkProcessCocoa.mm
+    NetworkProcess/cocoa/NetworkSessionCocoa.mm
 
     NetworkProcess/mac/NetworkDiskCacheMonitor.mm
     NetworkProcess/mac/NetworkLoadMac.mm
@@ -151,6 +152,7 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/Cocoa/WKConnection.mm
     UIProcess/API/Cocoa/WKError.mm
     UIProcess/API/Cocoa/WKFrameInfo.mm
+    UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
     UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
     UIProcess/API/Cocoa/WKNavigation.mm
     UIProcess/API/Cocoa/WKNavigationAction.mm
index f439f91..ae64450 100644 (file)
@@ -222,6 +222,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PLUGIN_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)