Title: [210884] trunk/Source
- Revision
- 210884
- Author
- [email protected]
- Date
- 2017-01-18 14:13:20 -0800 (Wed, 18 Jan 2017)
Log Message
Fix CMake build.
* PlatformMac.cmake:
Source/WebCore:
* platform/spi/cocoa/IOSurfaceSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210883 => 210884)
--- trunk/Source/WebCore/ChangeLog 2017-01-18 21:40:26 UTC (rev 210883)
+++ trunk/Source/WebCore/ChangeLog 2017-01-18 22:13:20 UTC (rev 210884)
@@ -1,3 +1,10 @@
+2017-01-18 Alex Christensen <[email protected]>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+ * platform/spi/cocoa/IOSurfaceSPI.h:
+
2017-01-18 Myles C. Maxfield <[email protected]>
[Cocoa] Variation fonts without variations specified are not rendered as if the default variations were specified
Modified: trunk/Source/WebCore/PlatformMac.cmake (210883 => 210884)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-01-18 21:40:26 UTC (rev 210883)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-01-18 22:13:20 UTC (rev 210884)
@@ -313,6 +313,7 @@
platform/cf/SharedBufferCF.cpp
platform/cf/URLCF.cpp
+ platform/cocoa/CPUTimeCocoa.mm
platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
platform/cocoa/CoreVideoSoftLink.cpp
platform/cocoa/DisplaySleepDisablerCocoa.cpp
Modified: trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (210883 => 210884)
--- trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2017-01-18 21:40:26 UTC (rev 210883)
+++ trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2017-01-18 22:13:20 UTC (rev 210884)
@@ -88,6 +88,9 @@
#else
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+#import <IOSurface/IOSurfaceTypes.h>
+#else
enum {
kIOSurfacePurgeableNonVolatile = 0,
kIOSurfacePurgeableVolatile = 1,
@@ -94,6 +97,7 @@
kIOSurfacePurgeableEmpty = 2,
kIOSurfacePurgeableKeepCurrent = 3,
};
+#endif
#endif
Modified: trunk/Source/WebKit2/ChangeLog (210883 => 210884)
--- trunk/Source/WebKit2/ChangeLog 2017-01-18 21:40:26 UTC (rev 210883)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-18 22:13:20 UTC (rev 210884)
@@ -1,3 +1,9 @@
+2017-01-18 Alex Christensen <[email protected]>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
2017-01-18 Megan Gardner <[email protected]>
Ignore Connection Assertion if we are not using connection to send messages
Modified: trunk/Source/WebKit2/PlatformMac.cmake (210883 => 210884)
--- trunk/Source/WebKit2/PlatformMac.cmake 2017-01-18 21:40:26 UTC (rev 210883)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-01-18 22:13:20 UTC (rev 210884)
@@ -156,6 +156,7 @@
Shared/mac/WebHitTestResultData.mm
Shared/mac/WebMemorySampler.mac.mm
+ UIProcess/HighPerformanceGraphicsUsageSampler.cpp
UIProcess/WebContextMenuListenerProxy.cpp
UIProcess/WebResourceLoadStatisticsStore.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
