Title: [231732] branches/safari-606.1.17-branch/Source/WebCore/PAL
- Revision
- 231732
- Author
- [email protected]
- Date
- 2018-05-11 21:25:47 -0700 (Fri, 11 May 2018)
Log Message
Cherry-pick r231731. rdar://problem/39806412
Follow-up build fix to r231721.
* pal/cf/CoreMediaSoftLink.cpp:
* pal/cf/CoreMediaSoftLink.h:
Unify the conditions between the header and the implementation files, and have watchOS and
tvOS keyed off iOS.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog (231731 => 231732)
--- branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog 2018-05-12 04:19:10 UTC (rev 231731)
+++ branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog 2018-05-12 04:25:47 UTC (rev 231732)
@@ -1,3 +1,27 @@
+2018-05-11 Babak Shafiei <[email protected]>
+
+ Cherry-pick r231731. rdar://problem/39806412
+
+ Follow-up build fix to r231721.
+
+ * pal/cf/CoreMediaSoftLink.cpp:
+ * pal/cf/CoreMediaSoftLink.h:
+ Unify the conditions between the header and the implementation files, and have watchOS and
+ tvOS keyed off iOS.
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-05-11 Dan Bernstein <[email protected]>
+
+ Follow-up build fix to r231721.
+
+ * pal/cf/CoreMediaSoftLink.cpp:
+ * pal/cf/CoreMediaSoftLink.h:
+ Unify the conditions between the header and the implementation files, and have watchOS and
+ tvOS keyed off iOS.
+
2018-05-11 Jason Marcell <[email protected]>
Cherry-pick r231721. rdar://problem/39806412
Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (231731 => 231732)
--- branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-05-12 04:19:10 UTC (rev 231731)
+++ branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-05-12 04:25:47 UTC (rev 231732)
@@ -35,7 +35,7 @@
#include <CoreVideo/CoreVideo.h>
#endif
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 120000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101400)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500)
#define CMSAMPLEBUFFERCALL_NOESCAPE
#else
#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (231731 => 231732)
--- branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-12 04:19:10 UTC (rev 231731)
+++ branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-12 04:25:47 UTC (rev 231732)
@@ -37,7 +37,7 @@
#define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
#endif
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 60000) || (PLATFORM(TVOS) && __TV_OS_VERSION_MAX_ALLOWED < 130000)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500)
#define CMSAMPLEBUFFERCALL_NOESCAPE
#else
#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
