Ignore MediaController in the video fullscreen button logic

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/v8/ExceptionStatePlaceholder.h"
 #include "core/events/MouseEvent.h"
+#include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/MediaController.h"
 #include "core/rendering/RenderTheme.h"
 
 namespace WebCore {
 
 #if OS(ANDROID)
 static const bool alwaysHideFullscreenControls = true;
 static const bool needOverlayPlayButton = true;
 #else
@@ skipping 142 matching lines @@
 
     if (!mediaControllerInterface().hasAudio()) {
         m_volumeSlider->hide();
     } else {
         m_volumeSlider->show();
         m_volumeSlider->setVolume(mediaControllerInterface().volume());
     }
 
     refreshClosedCaptionsButtonVisibility();
 
-    if (mediaControllerInterface().hasVideo())
+    if (mediaElement().hasVideo() && document().settings() && document().settings()->fullScreenEnabled())
         m_fullScreenButton->show();
     else
         m_fullScreenButton->hide();
 
     makeOpaque();
 }
 
 void MediaControls::show()
 {
     makeOpaque();
@@ skipping 35 matching lines @@
 
     if (m_isFullscreen)
         startHideFullscreenControlsTimer();
 }
 
 void MediaControls::playbackProgressed()
 {
     m_timeline->setPosition(mediaControllerInterface().currentTime());
     updateCurrentTimeDisplay();
 
-    if (!m_isMouseOverControls && mediaControllerInterface().hasVideo())
+    if (!m_isMouseOverControls && mediaElement().hasVideo())
         makeTransparent();
 }
 
 void MediaControls::playbackStopped()
 {
     if (m_overlayPlayButton)
         m_overlayPlayButton->updateDisplayType();
     m_playButton->updateDisplayType();
     m_timeline->setPosition(mediaControllerInterface().currentTime());
     updateCurrentTimeDisplay();
@@ skipping 177 matching lines @@
 
 void MediaControls::updateTextTrackDisplay()
 {
     if (!m_textDisplayContainer)
         createTextTrackDisplay();
 
     m_textDisplayContainer->updateDisplay();
 }
 
 }