Try again to fix the Internal iOS Simulator build after r221485.
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Sep 2017 19:47:53 +0000 (19:47 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Sep 2017 19:47:53 +0000 (19:47 +0000)
* pal/spi/cg/CoreGraphicsSPI.h:

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

Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h

index 7b04455..a854bc3 100644 (file)
@@ -1,5 +1,11 @@
 2017-09-01  Andy Estes  <aestes@apple.com>
 
+        Try again to fix the Internal iOS Simulator build after r221485.
+
+        * pal/spi/cg/CoreGraphicsSPI.h:
+
+2017-09-01  Andy Estes  <aestes@apple.com>
+
         Try to fix the Internal iOS Simulator build after r221485.
 
         * pal/spi/cg/CoreGraphicsSPI.h:
index 2c70dca..0bfd81f 100644 (file)
 #include <CoreGraphics/CGFontCache.h>
 #include <CoreGraphics/CoreGraphicsPrivate.h>
 
-#if PLATFORM(COCOA)
-#include <CoreGraphics/CGSNotifier.h>
-#endif
-
 #else
 
 struct CGFontHMetrics {
@@ -178,6 +174,10 @@ struct CGFocusRingStyle {
 };
 typedef struct CGFocusRingStyle CGFocusRingStyle;
 
+#endif // PLATFORM(COCOA)
+
+#if PLATFORM(MAC)
+
 typedef CF_ENUM(uint32_t, CGSNotificationType) {
     kCGSFirstConnectionNotification = 900,
     kCGSFirstSessionNotification = 1500,
@@ -188,7 +188,7 @@ static const CGSNotificationType kCGSConnectionWindowModificationsStopped = (CGS
 static const CGSNotificationType kCGSessionConsoleConnect = kCGSFirstSessionNotification;
 static const CGSNotificationType kCGSessionConsoleDisconnect = (CGSNotificationType)(kCGSessionConsoleConnect + 1);
 
-#endif // PLATFORM(COCOA)
+#endif // PLATFORM(MAC)
 
 #endif // USE(APPLE_INTERNAL_SDK)
 
@@ -204,7 +204,9 @@ typedef struct CF_BRIDGED_TYPE(id) CGStyle* CGStyleRef;
 
 typedef void* CGSNotificationArg;
 typedef void* CGSNotificationData;
+#endif
 
+#if PLATFORM(MAC)
 typedef void (*CGSNotifyConnectionProcPtr)(CGSNotificationType, void* data, uint32_t data_length, void* arg, CGSConnectionID);
 typedef void (*CGSNotifyProcPtr)(CGSNotificationType, void* data, uint32_t data_length, void* arg);
 #endif
@@ -266,8 +268,6 @@ CGColorSpaceRef CGContextCopyDeviceColorSpace(CGContextRef);
 CGError CGSNewRegionWithRect(const CGRect*, CGRegionRef*);
 CGError CGSPackagesEnableConnectionOcclusionNotifications(CGSConnectionID, bool flag, bool* outCurrentVisibilityState);
 CGError CGSPackagesEnableConnectionWindowModificationNotifications(CGSConnectionID, bool flag, bool* outConnectionIsCurrentlyIdle);
-CGError CGSRegisterConnectionNotifyProc(CGSConnectionID, CGSNotifyConnectionProcPtr, CGSNotificationType, void* arg);
-CGError CGSRegisterNotifyProc(CGSNotifyProcPtr, CGSNotificationType, void* arg);
 CGError CGSReleaseRegion(const CGRegionRef CF_RELEASES_ARGUMENT);
 CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
 CGError CGSSetWindowAlpha(CGSConnectionID, CGSWindowID, float alpha);
@@ -291,7 +291,8 @@ CFArrayRef CGSHWCaptureWindowList(CGSConnectionID, CGSWindowIDList windowList, C
 CGError CGSSetConnectionProperty(CGSConnectionID, CGSConnectionID ownerCid, CFStringRef key, CFTypeRef value);
 CGError CGSCopyConnectionProperty(CGSConnectionID, CGSConnectionID ownerCid, CFStringRef key, CFTypeRef *value);
 CGError CGSGetScreenRectForWindow(CGSConnectionID, CGSWindowID, CGRect *);
-
+CGError CGSRegisterConnectionNotifyProc(CGSConnectionID, CGSNotifyConnectionProcPtr, CGSNotificationType, void* arg);
+CGError CGSRegisterNotifyProc(CGSNotifyProcPtr, CGSNotificationType, void* arg);
 bool ColorSyncProfileIsWideGamut(ColorSyncProfileRef);
 #endif