Title: [223657] branches/safari-604-branch/Source/WebCore
- Revision
- 223657
- Author
- [email protected]
- Date
- 2017-10-18 21:29:48 -0700 (Wed, 18 Oct 2017)
Log Message
Cherry-pick r223289. rdar://problem/34958928
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223656 => 223657)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:45 UTC (rev 223656)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:48 UTC (rev 223657)
@@ -1,5 +1,16 @@
2017-10-18 Jason Marcell <[email protected]>
+ Cherry-pick r223289. rdar://problem/34958928
+
+ 2017-10-13 Jer Noble <[email protected]>
+
+ Unreviewed build fix; forward declare the type of IOSurfaceRef.
+
+ * platform/cocoa/CoreVideoSoftLink.cpp:
+ * platform/cocoa/CoreVideoSoftLink.h:
+
+2017-10-18 Jason Marcell <[email protected]>
+
Cherry-pick r223287. rdar://problem/34958928
2017-10-13 Jer Noble <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp (223656 => 223657)
--- branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2017-10-19 04:29:45 UTC (rev 223656)
+++ branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2017-10-19 04:29:48 UTC (rev 223657)
@@ -28,6 +28,8 @@
#include <CoreVideo/CoreVideo.h>
#include <wtf/SoftLinking.h>
+typedef struct __IOSurface* IOSurfaceRef;
+
SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, CoreVideo)
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVBufferGetAttachment, CFTypeRef, (CVBufferRef buffer, CFStringRef key, CVAttachmentMode* attachmentMode), (buffer, key, attachmentMode))
Modified: branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h (223656 => 223657)
--- branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2017-10-19 04:29:45 UTC (rev 223656)
+++ branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2017-10-19 04:29:48 UTC (rev 223657)
@@ -29,6 +29,8 @@
#include <CoreVideo/CoreVideo.h>
#include <wtf/SoftLinking.h>
+typedef struct __IOSurface* IOSurfaceRef;
+
SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, CoreVideo)
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVBufferGetAttachment, CFTypeRef, (CVBufferRef buffer, CFStringRef key, CVAttachmentMode* attachmentMode), (buffer, key, attachmentMode))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
