Index: Source/core/html/shadow/MediaControlElements.cpp |
diff --git a/Source/core/html/shadow/MediaControlElements.cpp b/Source/core/html/shadow/MediaControlElements.cpp |
index ee622ee2f1a88a96a48112a0ced859d6c182be91..607da7afe493c6c994f6bb3b6fd1b958f6f20ffd 100644 |
--- a/Source/core/html/shadow/MediaControlElements.cpp |
+++ b/Source/core/html/shadow/MediaControlElements.cpp |
@@ -131,6 +131,12 @@ void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme |
stopTimer(); |
} |
+void MediaControlPanelElement::didBecomeVisible() |
+{ |
+ ASSERT(m_isDisplayed && m_opaque); |
+ mediaElement().mediaControlsDidBecomeVisible(); |
+} |
+ |
void MediaControlPanelElement::makeOpaque() |
{ |
if (m_opaque) |
@@ -139,8 +145,10 @@ void MediaControlPanelElement::makeOpaque() |
setInlineStyleProperty(CSSPropertyOpacity, 1.0, CSSPrimitiveValue::CSS_NUMBER); |
m_opaque = true; |
- if (m_isDisplayed) |
+ if (m_isDisplayed) { |
show(); |
+ didBecomeVisible(); |
+ } |
} |
void MediaControlPanelElement::makeTransparent() |
@@ -156,7 +164,13 @@ void MediaControlPanelElement::makeTransparent() |
void MediaControlPanelElement::setIsDisplayed(bool isDisplayed) |
{ |
+ if (m_isDisplayed == isDisplayed) |
+ return; |
+ |
m_isDisplayed = isDisplayed; |
+ if (m_isDisplayed && m_opaque) { |
fs
2015/03/20 09:58:54
Nit: Unneeded {}
philipj_slow
2015/03/20 16:46:33
Oops.
|
+ didBecomeVisible(); |
+ } |
} |
bool MediaControlPanelElement::keepEventInNode(Event* event) |