Changeset 260217 in webkit

Timestamp:

Apr 16, 2020, 1:27:12 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

Unreviewed build-fix after r260182; guard call to fullscreenManager() for ports which do not
ENABLE(FULLSCREEN_API).

• html/MediaElementSession.cpp:

(WebCore::MediaElementSession::updateMediaUsageIfChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/MediaElementSession.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-16  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build-fix after r260182; guard call to fullscreenManager() for ports which do not
+        ENABLE(FULLSCREEN_API).
+
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::updateMediaUsageIfChanged):
+
 2020-04-16  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -1019 +1019 @@
         return;
 
-    auto* fullscreenElement = document.fullscreenManager().currentFullscreenElement();
+    bool isOutsideOfFullscreen = false;
+#if ENABLE(FULLSCREEN_API)
+    if (auto* fullscreenElement = document.fullscreenManager().currentFullscreenElement())
+        isOutsideOfFullscreen = !m_element.isDescendantOf(*fullscreenElement);
+#endif
     bool isAudio = client().presentationType() == MediaType::Audio;
     bool isVideo = client().presentationType() == MediaType::Video;
@@ -1055 +1059 @@
         hasBehaviorRestriction(RequirePlaybackToControlControlsManager) && !isPlaying,
         m_element.hasEverNotifiedAboutPlaying(),
-        fullscreenElement && !m_element.isDescendantOf(*fullscreenElement),
+        isOutsideOfFullscreen,
         isLargeEnoughForMainContent(MediaSessionMainContentPurpose::MediaControls),
     };