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

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

Issue 1156993013: New media playback UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fixed some tests from previous CL. Created 5 years, 5 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: Source/core/html/shadow/MediaControlElements.cpp
diff --git a/Source/core/html/shadow/MediaControlElements.cpp b/Source/core/html/shadow/MediaControlElements.cpp
index 4349f579f0cb357d14d23b3520433aa3724d3216..8b9a3650f43114b7471e38a9414320dad247d033 100644
--- a/Source/core/html/shadow/MediaControlElements.cpp
+++ b/Source/core/html/shadow/MediaControlElements.cpp
@@ -126,7 +126,7 @@ void MediaControlPanelElement::stopTimer()
void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelElement>*)
{
if (!m_opaque)
- hide();
+ setIsWanted(false);
stopTimer();
}
@@ -146,7 +146,7 @@ void MediaControlPanelElement::makeOpaque()
m_opaque = true;
if (m_isDisplayed) {
- show();
+ setIsWanted(true);
didBecomeVisible();
}
}
@@ -309,9 +309,9 @@ void MediaControlOverlayPlayButtonElement::defaultEventHandler(Event* event)
void MediaControlOverlayPlayButtonElement::updateDisplayType()
{
if (mediaElement().shouldShowControls() && mediaElement().togglePlayStateWillPlay())
philipj_slow 2015/07/09 08:56:10 Transform this into a single call to setIsWanted,
liberato (no reviews please) 2015/07/09 22:35:33 Done.
- show();
+ setIsWanted(true);
else
- hide();
+ setIsWanted(false);
}
bool MediaControlOverlayPlayButtonElement::keepEventInNode(Event* event)
@@ -333,7 +333,7 @@ PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaContr
button->ensureUserAgentShadowRoot();
button->setType(InputTypeNames::button);
button->setShadowPseudoId(AtomicString("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral));
- button->hide();
+ button->setIsWanted(false);
return button.release();
}
@@ -511,7 +511,7 @@ PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> MediaControlFullscre
button->ensureUserAgentShadowRoot();
button->setType(InputTypeNames::button);
button->setShadowPseudoId(AtomicString("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral));
- button->hide();
+ button->setIsWanted(false);
return button.release();
}

Powered by Google App Engine
This is Rietveld 408576698