Changeset 236882 in webkit

Timestamp:

Oct 5, 2018 12:30:42 PM (6 years ago)

Author:

jer.noble@apple.com

Message:

Further unreviewed watchOS build fix: videoPerformanceMetrics unavailable on watchOS.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::videoPlaybackQualityMetrics):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-05  Jer Noble  <jer.noble@apple.com>
+
+        Further unreviewed watchOS build fix: videoPerformanceMetrics unavailable on watchOS.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::videoPlaybackQualityMetrics):
+
 2018-10-05  Jer Noble  <jer.noble@apple.com>
 

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