[Blink, Media] Added controlsList to HTMLMediaElement

third_party/WebKit/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 14 matching lines @@
  */
 
 #include "core/html/shadow/MediaControls.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/Settings.h"
+#include "core/frame/UseCounter.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/shadow/MediaControlsMediaEventListener.h"
 #include "core/html/shadow/MediaControlsOrientationLockDelegate.h"
 #include "core/html/shadow/MediaControlsWindowEventListener.h"
 #include "core/html/track/TextTrackContainer.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTheme.h"
 #include "platform/EventDispatchForbiddenScope.h"
@@ skipping 15 matching lines @@
 
   if (!mediaElement.isHTMLVideoElement())
     return false;
 
   if (!mediaElement.hasVideo())
     return false;
 
   if (!Fullscreen::fullscreenEnabled(mediaElement.document()))
     return false;
 
+  if (mediaElement.controlsList()->tokens().contains("nofullscreen")) {

[DaleCurtis, 2017/03/09 18:45:48]

Do you really want callers to have to know about token names? Seems fragile and
prone to typos. Why not have an explicit controlsList().allowFullscreenbutton()
or something similarly named?

[whywhat, 2017/03/09 19:56:45]

Good suggestion! Done.

+    UseCounter::count(mediaElement.document(),
+                      UseCounter::HTMLMediaElementControlsListNoFullscreen);
+    return false;
+  }
+
   return true;
 }
 
 static bool shouldShowCastButton(HTMLMediaElement& mediaElement) {
   if (mediaElement.fastHasAttribute(HTMLNames::disableremoteplaybackAttr))
     return false;
 
   // Explicitly do not show cast button when the mediaControlsEnabled setting is
   // false to make sure the overlay does not appear.
   Document& document = mediaElement.document();
   if (document.settings() && !document.settings()->getMediaControlsEnabled())
     return false;
 
+  // The page disabled the button via the attribute.
+  if (mediaElement.controlsList()->tokens().contains("noremoteplayback")) {
+    UseCounter::count(mediaElement.document(),
+                      UseCounter::HTMLMediaElementControlsListNoRemotePlayback);
+    return false;
+  }
+
   return mediaElement.hasRemoteRoutes();
 }
 
 static bool preferHiddenVolumeControls(const Document& document) {
   return !document.settings() ||
          document.settings()->getPreferHiddenVolumeControls();
 }
 
 class MediaControls::BatchedControlUpdate {
   WTF_MAKE_NONCOPYABLE(BatchedControlUpdate);
@@ skipping 297 matching lines @@
   updatePlayState();
 
   updateCurrentTimeDisplay();
 
   m_timeline->setDuration(duration);
   m_timeline->setPosition(mediaElement().currentTime());
 
   onVolumeChange();
   onTextTracksAddedOrRemoved();
 
+  onControlsListUpdated();
+}
+
+void MediaControls::onControlsListUpdated() {
+  BatchedControlUpdate batch(this);
+
   m_fullscreenButton->setIsWanted(shouldShowFullscreenButton(mediaElement()));
 
   refreshCastButtonVisibilityWithoutUpdate();
 
   m_downloadButton->setIsWanted(
       m_downloadButton->shouldDisplayDownloadButton());
 }
 
 LayoutObject* MediaControls::layoutObjectForTextTrackLayout() {
   return m_panel->layoutObject();
@@ skipping 599 matching lines @@
   visitor->trace(m_overflowList);
   visitor->trace(m_castButton);
   visitor->trace(m_overlayCastButton);
   visitor->trace(m_mediaEventListener);
   visitor->trace(m_windowEventListener);
   visitor->trace(m_orientationLockDelegate);
   HTMLDivElement::trace(visitor);
 }
 
 }  // namespace blink