Modified: tags/Safari-602.1.35/Source/WebCore/ChangeLog (201579 => 201580)
--- tags/Safari-602.1.35/Source/WebCore/ChangeLog 2016-06-02 00:23:59 UTC (rev 201579)
+++ tags/Safari-602.1.35/Source/WebCore/ChangeLog 2016-06-02 00:38:57 UTC (rev 201580)
@@ -1,3 +1,13 @@
+2016-06-01 Babak Shafiei <[email protected]>
+
+ Merge r201576.
+
+ 2016-06-01 Alexey Proskuryakov <[email protected]>
+
+ Update QuartzCoreSPI.h for <rdar://problem/26584828>.
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+
2016-05-31 Joseph Pecoraro <[email protected]>
Web Inspector: ReportExtraMemoryCost IDL attribute should also be used to generate estimatedSize method
Modified: tags/Safari-602.1.35/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (201579 => 201580)
--- tags/Safari-602.1.35/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-06-02 00:23:59 UTC (rev 201579)
+++ tags/Safari-602.1.35/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-06-02 00:38:57 UTC (rev 201580)
@@ -145,15 +145,16 @@
#endif
+// FIXME: Declare these functions even when USE(APPLE_INTERNAL_SDK) is true once we can fix <rdar://problem/26584828> in a better way.
+#if !USE(APPLE_INTERNAL_SDK)
EXTERN_C void CARenderServerCaptureLayerWithTransform(mach_port_t serverPort, uint32_t clientId, uint64_t layerId,
uint32_t slotId, int32_t ox, int32_t oy, const CATransform3D *);
-
#if USE(IOSURFACE)
EXTERN_C void CARenderServerRenderLayerWithTransform(mach_port_t server_port, uint32_t client_id, uint64_t layer_id, IOSurfaceRef iosurface, int32_t ox, int32_t oy, const CATransform3D *matrix);
EXTERN_C void CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(mach_port_t server_port, CFStringRef display_name, uint32_t client_id, uint64_t layer_id, IOSurfaceRef iosurface, int32_t ox, int32_t oy, const CATransform3D *matrix, CFTimeInterval offset);
#endif
+#endif
-
// FIXME: Move this into the APPLE_INTERNAL_SDK block once it's in an SDK.
@interface CAContext (AdditionalDetails)
#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
