Title: [236946] tags/Safari-607.1.10/Source/WebCore
- Revision
- 236946
- Author
- kocsen_ch...@apple.com
- Date
- 2018-10-08 16:20:21 -0700 (Mon, 08 Oct 2018)
Log Message
Revert r236882. rdar://problem/45109065
Modified Paths
Diff
Modified: tags/Safari-607.1.10/Source/WebCore/ChangeLog (236945 => 236946)
--- tags/Safari-607.1.10/Source/WebCore/ChangeLog 2018-10-08 23:19:25 UTC (rev 236945)
+++ tags/Safari-607.1.10/Source/WebCore/ChangeLog 2018-10-08 23:20:21 UTC (rev 236946)
@@ -1,3 +1,7 @@
+2018-10-08 Kocsen Chung <kocsen_ch...@apple.com>
+
+ Revert r236882. rdar://problem/45109065
+
2018-10-08 Yacine Bandou <yacine.bandou_...@softathome.com>
[EME][GStreamer] Add support for WebM encrypted caps "application/x-webm-enc"
Modified: tags/Safari-607.1.10/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (236945 => 236946)
--- tags/Safari-607.1.10/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-08 23:19:25 UTC (rev 236945)
+++ tags/Safari-607.1.10/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-08 23:20:21 UTC (rev 236946)
@@ -3263,12 +3263,10 @@
if (![m_videoLayer respondsToSelector:@selector(videoPerformanceMetrics)])
return std::nullopt;
-#if PLATFORM(WATCHOS)
- return std::nullopt;
-#else
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+#if !PLATFORM(WATCHOS)
auto metrics = [m_videoLayer videoPerformanceMetrics];
if (!metrics)
return std::nullopt;
@@ -3276,6 +3274,8 @@
uint32_t displayCompositedFrames = 0;
if ([metrics respondsToSelector:@selector(numberOfDisplayCompositedVideoFrames)])
displayCompositedFrames = [metrics numberOfDisplayCompositedVideoFrames];
+#endif
+#pragma clang diagnostic pop
return VideoPlaybackQualityMetrics {
static_cast<uint32_t>([metrics totalNumberOfVideoFrames]),
@@ -3284,8 +3284,6 @@
[metrics totalFrameDelay],
displayCompositedFrames,
};
-#pragma clang diagnostic pop
-#endif
}
NSArray* assetMetadataKeyNames()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
