Make video.webkitSupportsFullscreen an alias of document.fullscreenEnabled

Source/core/html/shadow/MediaControls.cpp

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/shadow/MediaControls.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ClientRect.h"
+#include "core/dom/Fullscreen.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/MediaController.h"
 #include "core/html/track/TextTrackContainer.h"
 #include "core/layout/LayoutTheme.h"
 
 namespace blink {
 
 // If you change this value, then also update the corresponding value in
 // LayoutTests/media/media-controls.js.
 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3;
 
-static bool fullscreenIsSupported(const Document& document)
+static bool shouldShowFullscreenButton(const HTMLMediaElement& mediaElement)
 {
-    return !document.settings() || document.settings()->fullscreenSupported();
+    // Unconditionally allow the user to exit fullscreen if we are in it
+    // now.  Especially on android, when we might not yet know if
+    // fullscreen is supported, we sometimes guess incorrectly and show
+    // the button earlier, and we don't want to remove it here if the
+    // user chose to enter fullscreen.  crbug.com/500732 .
+    if (mediaElement.isFullscreen())
+        return true;
+
+    if (!mediaElement.hasVideo())
+        return false;
+
+    if (!Fullscreen::fullscreenEnabled(mediaElement.document()))
+        return false;
+
+    return true;
 }
 
 MediaControls::MediaControls(HTMLMediaElement& mediaElement)
     : HTMLDivElement(mediaElement.document())
     , m_mediaElement(&mediaElement)
     , m_overlayEnclosure(nullptr)
     , m_overlayPlayButton(nullptr)
     , m_overlayCastButton(nullptr)
     , m_enclosure(nullptr)
     , m_panel(nullptr)
@@ skipping 119 matching lines @@
     m_timeline->setPosition(mediaElement().currentTime());
 
     if (!mediaElement().hasAudio())
         m_volumeSlider->hide();
     else
         m_volumeSlider->show();
     updateVolume();
 
     refreshClosedCaptionsButtonVisibility();
 
-    // Unconditionally allow the user to exit fullscreen if we are in it
-    // now.  Especially on android, when we might not yet know if
-    // fullscreen is supported, we sometimes guess incorrectly and show
-    // the button earlier, and we don't want to remove it here if the
-    // user chose to enter fullscreen.  crbug.com/500732 .
-    if ((mediaElement().hasVideo() && fullscreenIsSupported(document()))
-        || mediaElement().isFullscreen())
+    if (shouldShowFullscreenButton(mediaElement()))
         m_fullScreenButton->show();
     else
         m_fullScreenButton->hide();
 
     refreshCastButtonVisibility();
     makeOpaque();
 }
 
 LayoutObject* MediaControls::layoutObjectForTextTrackLayout()
 {
@@ skipping 335 matching lines @@
     visitor->trace(m_toggleClosedCaptionsButton);
     visitor->trace(m_fullScreenButton);
     visitor->trace(m_durationDisplay);
     visitor->trace(m_enclosure);
     visitor->trace(m_castButton);
     visitor->trace(m_overlayCastButton);
     HTMLDivElement::trace(visitor);
 }
 
 }