Modified: trunk/Source/WebCore/PAL/ChangeLog (221492 => 221493)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-09-01 19:31:55 UTC (rev 221492)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-09-01 19:47:53 UTC (rev 221493)
@@ -1,5 +1,11 @@
2017-09-01 Andy Estes <aes...@apple.com>
+ Try again to fix the Internal iOS Simulator build after r221485.
+
+ * pal/spi/cg/CoreGraphicsSPI.h:
+
+2017-09-01 Andy Estes <aes...@apple.com>
+
Try to fix the Internal iOS Simulator build after r221485.
* pal/spi/cg/CoreGraphicsSPI.h:
Modified: trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (221492 => 221493)
--- trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2017-09-01 19:31:55 UTC (rev 221492)
+++ trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2017-09-01 19:47:53 UTC (rev 221493)
@@ -44,10 +44,6 @@
#include <CoreGraphics/CGFontCache.h>
#include <CoreGraphics/CoreGraphicsPrivate.h>
-#if PLATFORM(COCOA)
-#include <CoreGraphics/CGSNotifier.h>
-#endif
-
#else
struct CGFontHMetrics {
@@ -178,6 +174,10 @@
};
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 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 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 @@
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 @@
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
