Title: [223098] branches/safari-604-branch/Source/WebCore
- Revision
- 223098
- Author
- [email protected]
- Date
- 2017-10-09 17:08:09 -0700 (Mon, 09 Oct 2017)
Log Message
Cherry-pick r221100. rdar://problem/34771028
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223097 => 223098)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-10 00:08:06 UTC (rev 223097)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-10 00:08:09 UTC (rev 223098)
@@ -1,5 +1,16 @@
2017-10-02 Jason Marcell <[email protected]>
+ Cherry-pick r221100. rdar://problem/34771028
+
+ 2017-08-23 Jer Noble <[email protected]>
+
+ Build fix for 32-bit Mac after r221098. Make sure constant used in WebCoreDecompressionSession is SoftLinked.
+
+ * platform/cf/CoreMediaSoftLink.cpp:
+ * platform/cf/CoreMediaSoftLink.h:
+
+2017-10-02 Jason Marcell <[email protected]>
+
Cherry-pick r221016. rdar://problem/34770830
2017-08-22 Jer Noble <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp (223097 => 223098)
--- branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2017-10-10 00:08:06 UTC (rev 223097)
+++ branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2017-10-10 00:08:09 UTC (rev 223098)
@@ -131,6 +131,7 @@
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_PostNotificationWhenConsumed, CFStringRef)
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding, CFStringRef)
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleAttachmentKey_DisplayImmediately, CFStringRef)
+SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleAttachmentKey_IsDependedOnByOthers, CFStringRef)
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleBufferConsumerNotification_BufferConsumed, CFStringRef)
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef)
Modified: branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.h (223097 => 223098)
--- branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2017-10-10 00:08:06 UTC (rev 223097)
+++ branches/safari-604-branch/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2017-10-10 00:08:09 UTC (rev 223098)
@@ -210,6 +210,8 @@
#define kCMSampleAttachmentKey_NotSync get_CoreMedia_kCMSampleAttachmentKey_NotSync()
SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreMedia, kCMSampleAttachmentKey_DisplayImmediately, CFStringRef)
#define kCMSampleAttachmentKey_DisplayImmediately get_CoreMedia_kCMSampleAttachmentKey_DisplayImmediately()
+SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreMedia, kCMSampleAttachmentKey_IsDependedOnByOthers, CFStringRef)
+#define kCMSampleAttachmentKey_IsDependedOnByOthers get_CoreMedia_kCMSampleAttachmentKey_IsDependedOnByOthers()
SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately, CFStringRef)
#define kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately get_CoreMedia_kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately()
SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_DrainAfterDecoding, CFStringRef)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
