Changeset 236946 in webkit

Timestamp:

Oct 8, 2018 4:20:21 PM (6 years ago)

Author:

Kocsen Chung

Message:

Revert r236882. rdar://problem/45109065

Location:

tags/Safari-607.1.10/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (3 diffs)

tags/Safari-607.1.10/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-08  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Revert r236882. rdar://problem/45109065
+
 2018-10-08  Yacine Bandou  <yacine.bandou_ext@softathome.com>
 

tags/Safari-607.1.10/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -3264 +3264 @@
         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)
@@ -3277 +3275 @@
     if ([metrics respondsToSelector:@selector(numberOfDisplayCompositedVideoFrames)])
         displayCompositedFrames = [metrics numberOfDisplayCompositedVideoFrames];
+#endif
+#pragma clang diagnostic pop
 
     return VideoPlaybackQualityMetrics {
@@ -3285 +3285 @@
         displayCompositedFrames,
     };
-#pragma clang diagnostic pop
-#endif
 }