Skip to site navigation (Press enter)

[webkit-changes] [223656] branches/safari-604-branch/Source/WebCore

jmarcell Wed, 18 Oct 2017 21:30:46 -0700

Title: [223656] branches/safari-604-branch/Source/WebCore

Revision: 223656
Author: [email protected]
Date: 2017-10-18 21:29:45 -0700 (Wed, 18 Oct 2017)

Log Message

Cherry-pick r223287. rdar://problem/34958928


Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp
branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h

Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223655 => 223656)


--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-10-19 04:29:43 UTC (rev 223655)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-10-19 04:29:45 UTC (rev 223656)
@@ -1,5 +1,16 @@
 2017-10-18  Jason Marcell  <[email protected]>
 
+        Cherry-pick r223287. rdar://problem/34958928
+
+    2017-10-13  Jer Noble  <[email protected]>
+
+            Unreviewed build fix; add soft link macros for newly called CoreVideo methods.
+
+            * platform/cocoa/CoreVideoSoftLink.cpp:
+            * platform/cocoa/CoreVideoSoftLink.h:
+
+2017-10-18  Jason Marcell  <[email protected]>
+
         Cherry-pick r223285. rdar://problem/34958928
 
     2017-10-13  Jer Noble  <[email protected]>

Modified: branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp (223655 => 223656)


--- branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp	2017-10-19 04:29:43 UTC (rev 223655)
+++ branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp	2017-10-19 04:29:45 UTC (rev 223656)
@@ -30,6 +30,7 @@
 
 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))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetTypeID, CFTypeID, (), ())
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetHeight, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
@@ -42,6 +43,7 @@
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferPoolCreate, CVReturn,(CFAllocatorRef allocator, CFDictionaryRef poolAttributes, CFDictionaryRef pixelBufferAttributes, CVPixelBufferPoolRef* poolOut), (allocator, poolAttributes, pixelBufferAttributes, poolOut))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferPoolCreatePixelBuffer, CVReturn, (CFAllocatorRef allocator, CVPixelBufferPoolRef pixelBufferPool, CVPixelBufferRef* pixelBufferOut), (allocator, pixelBufferPool, pixelBufferOut))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetIOSurface, IOSurfaceRef, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferPixelFormatTypeKey, CFStringRef)
 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferCGBitmapContextCompatibilityKey, CFStringRef)
 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferCGImageCompatibilityKey, CFStringRef)

Modified: branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h (223655 => 223656)


--- branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h	2017-10-19 04:29:43 UTC (rev 223655)
+++ branches/safari-604-branch/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h	2017-10-19 04:29:45 UTC (rev 223656)
@@ -31,6 +31,8 @@
 
 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))
+#define CVBufferGetAttachment softLink_CoreVideo_CVBufferGetAttachment
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetTypeID, CFTypeID, (), ())
 #define CVPixelBufferGetTypeID softLink_CoreVideo_CVPixelBufferGetTypeID
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
@@ -55,6 +57,8 @@
 #define CVPixelBufferPoolCreate softLink_CoreVideo_CVPixelBufferPoolCreate
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferPoolCreatePixelBuffer, CVReturn, (CFAllocatorRef allocator, CVPixelBufferPoolRef pixelBufferPool, CVPixelBufferRef* pixelBufferOut), (allocator, pixelBufferPool, pixelBufferOut))
 #define CVPixelBufferPoolCreatePixelBuffer softLink_CoreVideo_CVPixelBufferPoolCreatePixelBuffer
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetIOSurface, IOSurfaceRef, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetIOSurface softLink_CoreVideo_CVPixelBufferGetIOSurface
 
 SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreVideo, kCVPixelBufferPixelFormatTypeKey, CFStringRef)
 #define kCVPixelBufferPixelFormatTypeKey get_CoreVideo_kCVPixelBufferPixelFormatTypeKey()

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes