Chromium Code Reviews| 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 589e7c2e5f4eeb6d6816d1d21fdcf2321ff14616..ce65cb5214bdc96bd01b29cbde74e12e55633bdf 100644 |
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
| @@ -432,7 +432,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); |
| @@ -563,6 +564,8 @@ void HTMLMediaElement::parseAttribute( |
| } else if (name == controlsAttr) { |
| UseCounter::count(document(), |
| UseCounter::HTMLMediaElementControlsAttribute); |
| + if (m_controlsList->value() != fastGetAttribute(controlsAttr)) |
| + m_controlsList->setValue(fastGetAttribute(controlsAttr)); |
|
fs
2017/01/25 09:34:16
m_controlsList->setValue(params.newValue);
(and p
whywhat
2017/03/01 16:17:20
Done.
|
| updateControlsVisibility(); |
| } else if (name == preloadAttr) { |
| setPlayerPreload(); |
| @@ -2387,6 +2390,16 @@ 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(controlsAttr) != m_controlsList->value()) |
| + setAttribute(controlsAttr, m_controlsList->value()); |
|
fs
2017/01/25 09:34:16
Could (should?) use setSynchronizedLazyAttribute,
whywhat
2017/03/01 16:17:20
Done. Have to call updateControlsVisibility here.
|
| +} |
| + |
| double HTMLMediaElement::volume() const { |
| return m_volume; |
| } |
| @@ -3773,6 +3786,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); |