Diff
Modified: trunk/Source/WebCore/ChangeLog (218454 => 218455)
--- trunk/Source/WebCore/ChangeLog 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebCore/ChangeLog 2017-06-17 20:03:58 UTC (rev 218455)
@@ -1,3 +1,10 @@
+2017-06-17 Alex Christensen <[email protected]>
+
+ Fix CMake build
+
+ * PlatformMac.cmake:
+ * bindings/js/ScriptGlobalObject.cpp:
+
2017-06-17 Commit Queue <[email protected]>
Unreviewed, rolling out r218438.
Modified: trunk/Source/WebCore/PlatformMac.cmake (218454 => 218455)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-06-17 20:03:58 UTC (rev 218455)
@@ -195,6 +195,7 @@
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 @@
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 @@
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 @@
platform/graphics/DisplayRefreshMonitor.cpp
platform/graphics/DisplayRefreshMonitorManager.cpp
+ platform/graphics/FourCC.cpp
platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
@@ -456,6 +460,7 @@
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
@@ -462,6 +467,7 @@
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
Modified: trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp (218454 => 218455)
--- trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp 2017-06-17 20:03:58 UTC (rev 218455)
@@ -34,6 +34,7 @@
#include "JSDOMConvertInterface.h"
#include "JSInspectorFrontendHost.h"
#include <runtime/IdentifierInlines.h>
+#include <runtime/JSObjectInlines.h>
using namespace JSC;
Modified: trunk/Source/WebKit2/CMakeLists.txt (218454 => 218455)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-06-17 20:03:58 UTC (rev 218455)
@@ -367,7 +367,6 @@
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
Modified: trunk/Source/WebKit2/ChangeLog (218454 => 218455)
--- trunk/Source/WebKit2/ChangeLog 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-17 20:03:58 UTC (rev 218455)
@@ -1,3 +1,12 @@
+2017-06-17 Alex Christensen <[email protected]>
+
+ Fix CMake build
+
+ * CMakeLists.txt:
+ * NetworkProcess/capture/NetworkCaptureEvent.cpp:
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+
2017-06-17 Dan Bernstein <[email protected]>
Tried to fix non-iOS builds.
Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp (218454 => 218455)
--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp 2017-06-17 20:03:58 UTC (rev 218455)
@@ -29,6 +29,7 @@
#if ENABLE(NETWORK_CAPTURE)
#define JSON_NOEXCEPTION 1
+#undef __EXCEPTIONS
#include "NetworkCaptureLogging.h"
#include "json.hpp"
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (218454 => 218455)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2017-06-17 20:03:58 UTC (rev 218455)
@@ -105,6 +105,7 @@
UIProcess/WebTextChecker.cpp
UIProcess/WebTextCheckerClient.cpp
+ UIProcess/API/C/WKGrammarDetail.cpp
UIProcess/API/C/WKResourceLoadStatisticsManager.cpp
UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
Modified: trunk/Source/WebKit2/PlatformWPE.cmake (218454 => 218455)
--- trunk/Source/WebKit2/PlatformWPE.cmake 2017-06-17 19:50:51 UTC (rev 218454)
+++ trunk/Source/WebKit2/PlatformWPE.cmake 2017-06-17 20:03:58 UTC (rev 218455)
@@ -97,6 +97,7 @@
UIProcess/WebResourceLoadStatisticsManager.cpp
UIProcess/WebResourceLoadStatisticsStore.cpp
+ UIProcess/API/C/WKGrammarDetail.cpp
UIProcess/API/C/WKResourceLoadStatisticsManager.cpp
UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
