Changeset 201580 in webkit

Timestamp:

Jun 1, 2016, 5:38:57 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r201576. rdar://problem/26584828

Location:

tags/Safari-602.1.35/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/spi/cocoa/QuartzCoreSPI.h (modified) (1 diff)

tags/Safari-602.1.35/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-01  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r201576.
+
+    2016-06-01  Alexey Proskuryakov  <ap@apple.com>
+
+            Update QuartzCoreSPI.h for <rdar://problem/26584828>.
+
+            * platform/spi/cocoa/QuartzCoreSPI.h:
+
 2016-05-31  Joseph Pecoraro  <pecoraro@apple.com>
 

tags/Safari-602.1.35/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

@@ -146 +146 @@
 #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.