| Index: Source/core/html/shadow/MediaControls.cpp
|
| diff --git a/Source/core/html/shadow/MediaControls.cpp b/Source/core/html/shadow/MediaControls.cpp
|
| index 2af3e93524f5377ae83bfa9e3f968527fd9c6192..cb63a23fcdc77cd2be5ebb05f25cd918607d88b8 100644
|
| --- a/Source/core/html/shadow/MediaControls.cpp
|
| +++ b/Source/core/html/shadow/MediaControls.cpp
|
| @@ -29,6 +29,7 @@
|
|
|
| #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"
|
| @@ -191,7 +192,7 @@ void MediaControls::reset()
|
|
|
| refreshClosedCaptionsButtonVisibility();
|
|
|
| - if (mediaControllerInterface().hasVideo())
|
| + if (mediaElement().hasVideo() && document().settings() && document().settings()->fullScreenEnabled())
|
| m_fullScreenButton->show();
|
| else
|
| m_fullScreenButton->hide();
|
| @@ -247,7 +248,7 @@ void MediaControls::playbackProgressed()
|
| m_timeline->setPosition(mediaControllerInterface().currentTime());
|
| updateCurrentTimeDisplay();
|
|
|
| - if (!m_isMouseOverControls && mediaControllerInterface().hasVideo())
|
| + if (!m_isMouseOverControls && mediaElement().hasVideo())
|
| makeTransparent();
|
| }
|
|
|
|
|