Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(840)

Unified Diff: Source/core/html/shadow/MediaControls.cpp

Issue 196793021: Ignore MediaController in the video fullscreen button logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/shadow/MediaControls.cpp
diff --git a/Source/core/html/shadow/MediaControls.cpp b/Source/core/html/shadow/MediaControls.cpp
index 61bd5b93da35a3769c32d0da0cbab7ff350ac56d..59d1a761f8f057338027c3287128b302c6b96a4d 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();
}
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698