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

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

Issue 2657723002: [Blink, Media] Added controlsList to HTMLMediaElement (Closed)
Patch Set: Rebased and readded the tests Created 3 years, 10 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
Index: third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
index 087b1013c313014963936a4221c8eedf8a6e6212..37c0569d3c2745b16e726a19ea2476ef3d965797 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
@@ -67,6 +67,9 @@ static bool shouldShowFullscreenButton(const HTMLMediaElement& mediaElement) {
if (!Fullscreen::fullscreenEnabled(mediaElement.document()))
return false;
+ if (mediaElement.controlsList()->tokens().contains("nofullscreen"))
+ return false;
+
return true;
}
@@ -80,6 +83,10 @@ static bool shouldShowCastButton(HTMLMediaElement& mediaElement) {
if (document.settings() && !document.settings()->getMediaControlsEnabled())
return false;
+ // The page disabled the button via the attribute.
+ if (mediaElement.controlsList()->tokens().contains("noremoteplayback"))
+ return false;
+
return mediaElement.hasRemoteRoutes();
}

Powered by Google App Engine
This is Rietveld 408576698