Fix CMake build
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 17 Jun 2017 20:03:58 +0000 (20:03 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 17 Jun 2017 20:03:58 +0000 (20:03 +0000)
Source/WebCore:

* PlatformMac.cmake:
* bindings/js/ScriptGlobalObject.cpp:

Source/WebKit2:

* CMakeLists.txt:
* NetworkProcess/capture/NetworkCaptureEvent.cpp:
* PlatformGTK.cmake:
* PlatformWPE.cmake:

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

Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/bindings/js/ScriptGlobalObject.cpp
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/PlatformWPE.cmake

index 42e6e91..0790a55 100644 (file)
@@ -1,3 +1,10 @@
+2017-06-17  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build
+
+        * PlatformMac.cmake:
+        * bindings/js/ScriptGlobalObject.cpp:
+
 2017-06-17  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r218438.
index 09d35d1..befebba 100644 (file)
@@ -195,6 +195,7 @@ list(APPEND WebCore_SOURCES
     crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
     crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
     crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+    crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp
     crypto/algorithms/CryptoAlgorithmSHA1.cpp
     crypto/algorithms/CryptoAlgorithmSHA224.cpp
     crypto/algorithms/CryptoAlgorithmSHA256.cpp
@@ -224,6 +225,7 @@ list(APPEND WebCore_SOURCES
     crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp
     crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp
     crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp
+    crypto/mac/CryptoAlgorithmRSA_PSSMac.cpp
     crypto/mac/CryptoAlgorithmRegistryMac.cpp
     crypto/mac/CryptoKeyECMac.cpp
     crypto/mac/CryptoKeyMac.cpp
@@ -354,6 +356,7 @@ list(APPEND WebCore_SOURCES
     platform/cocoa/SystemVersion.mm
     platform/cocoa/TelephoneNumberDetectorCocoa.cpp
     platform/cocoa/ThemeCocoa.mm
+    platform/cocoa/VideoToolboxSoftLink.cpp
     platform/cocoa/WebCoreNSErrorExtras.mm
 
     platform/gamepad/mac/HIDGamepad.cpp
@@ -361,6 +364,7 @@ list(APPEND WebCore_SOURCES
 
     platform/graphics/DisplayRefreshMonitor.cpp
     platform/graphics/DisplayRefreshMonitorManager.cpp
+    platform/graphics/FourCC.cpp
 
     platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
     platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
@@ -456,12 +460,14 @@ list(APPEND WebCore_SOURCES
     platform/graphics/cocoa/FontCacheCoreText.cpp
     platform/graphics/cocoa/FontCascadeCocoa.mm
     platform/graphics/cocoa/FontCocoa.mm
+    platform/graphics/cocoa/FontDescriptionCocoa.cpp
     platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
     platform/graphics/cocoa/FontPlatformDataCocoa.mm
     platform/graphics/cocoa/IOSurface.mm
     platform/graphics/cocoa/IOSurfacePoolCocoa.mm
     platform/graphics/cocoa/WebActionDisablingCALayerDelegate.mm
     platform/graphics/cocoa/WebCoreCALayerExtras.mm
+    platform/graphics/cocoa/WebCoreDecompressionSession.mm
     platform/graphics/cocoa/WebGPULayer.mm
 
     platform/graphics/cv/PixelBufferConformerCV.cpp
index c9901ac..22b6de8 100644 (file)
@@ -34,6 +34,7 @@
 #include "JSDOMConvertInterface.h"
 #include "JSInspectorFrontendHost.h"
 #include <runtime/IdentifierInlines.h>
+#include <runtime/JSObjectInlines.h>
 
 using namespace JSC;
 
index f8c4a8e..7c5ce6e 100644 (file)
@@ -367,7 +367,6 @@ set(WebKit2_SOURCES
     UIProcess/API/C/WKGeolocationManager.cpp
     UIProcess/API/C/WKGeolocationPermissionRequest.cpp
     UIProcess/API/C/WKGeolocationPosition.cpp
-    UIProcess/API/C/WKGrammarDetail.cpp
     UIProcess/API/C/WKHitTestResult.cpp
     UIProcess/API/C/WKIconDatabase.cpp
     UIProcess/API/C/WKInspector.cpp
index 2757794..dc6aea1 100644 (file)
@@ -1,3 +1,12 @@
+2017-06-17  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build
+
+        * CMakeLists.txt:
+        * NetworkProcess/capture/NetworkCaptureEvent.cpp:
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+
 2017-06-17  Dan Bernstein  <mitz@apple.com>
 
         Tried to fix non-iOS builds.
index f28fa08..fa4ed1a 100644 (file)
@@ -29,6 +29,7 @@
 #if ENABLE(NETWORK_CAPTURE)
 
 #define JSON_NOEXCEPTION 1
+#undef __EXCEPTIONS
 
 #include "NetworkCaptureLogging.h"
 #include "json.hpp"
index 6730386..66c92c2 100644 (file)
@@ -105,6 +105,7 @@ list(APPEND WebKit2_SOURCES
     UIProcess/WebTextChecker.cpp
     UIProcess/WebTextCheckerClient.cpp
 
+    UIProcess/API/C/WKGrammarDetail.cpp
     UIProcess/API/C/WKResourceLoadStatisticsManager.cpp
 
     UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
index 8463a74..2d129b3 100644 (file)
@@ -97,6 +97,7 @@ list(APPEND WebKit2_SOURCES
     UIProcess/WebResourceLoadStatisticsManager.cpp
     UIProcess/WebResourceLoadStatisticsStore.cpp
 
+    UIProcess/API/C/WKGrammarDetail.cpp
     UIProcess/API/C/WKResourceLoadStatisticsManager.cpp
 
     UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp