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

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.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/HTMLMediaElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index b20a17edb06b0a4bee5031030d34d2891a6fd04a..cb96ecce382edb1e2a230bb3ff5b304e23ed2157 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -464,7 +464,8 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName,
m_autoplayUmaHelper(AutoplayUmaHelper::create(this)),
m_remotePlaybackClient(nullptr),
m_autoplayVisibilityObserver(nullptr),
- m_mediaControls(nullptr) {
+ m_mediaControls(nullptr),
+ m_controlsList(HTMLMediaElementControlsList::create(this)) {
BLINK_MEDIA_LOG << "HTMLMediaElement(" << (void*)this << ")";
m_lockedPendingUserGesture = computeLockedPendingUserGesture(document);
@@ -598,6 +599,13 @@ void HTMLMediaElement::parseAttribute(
UseCounter::count(document(),
UseCounter::HTMLMediaElementControlsAttribute);
updateControlsVisibility();
+ } else if (name == controlslistAttr) {
+ UseCounter::count(document(),
+ UseCounter::HTMLMediaElementControlsListAttribute);
+ if (params.oldValue != params.newValue) {
+ m_controlsList->setValue(params.newValue);
+ updateControlsVisibility();
+ }
} else if (name == preloadAttr) {
setPlayerPreload();
} else if (name == disableremoteplaybackAttr) {
@@ -2437,6 +2445,18 @@ bool HTMLMediaElement::shouldShowControls(
return false;
}
+DOMTokenList* HTMLMediaElement::controlsList() const {
+ return m_controlsList.get();
+}
+
+void HTMLMediaElement::controlsListValueWasSet() {
+ // Update the attribute value which will update the controls visibility.
+ if (fastGetAttribute(controlslistAttr) != m_controlsList->value()) {
+ setSynchronizedLazyAttribute(controlslistAttr, m_controlsList->value());
+ updateControlsVisibility();
mlamouri (slow - plz ping) 2017/03/03 17:32:44 What about calling: ``` if (mediaControls()) med
whywhat 2017/03/07 12:59:45 Done.
+ }
+}
+
double HTMLMediaElement::volume() const {
return m_volume;
}
@@ -3823,6 +3843,7 @@ DEFINE_TRACE(HTMLMediaElement) {
visitor->trace(m_srcObject);
visitor->trace(m_autoplayVisibilityObserver);
visitor->trace(m_mediaControls);
+ visitor->trace(m_controlsList);
visitor->template registerWeakMembers<HTMLMediaElement,
&HTMLMediaElement::clearWeakMembers>(
this);

Powered by Google App Engine
This is Rietveld 408576698