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

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

Issue 1018593004: Implement <video controls> dodging for text track layout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ready for review Created 5 years, 9 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/MediaControls.cpp
diff --git a/Source/core/html/shadow/MediaControls.cpp b/Source/core/html/shadow/MediaControls.cpp
index b411b80e28e62a5f41c61e35d84c76dae5cec4eb..b0560f11dddbc156a7e77c71ccca1c75b39140a6 100644
--- a/Source/core/html/shadow/MediaControls.cpp
+++ b/Source/core/html/shadow/MediaControls.cpp
@@ -193,11 +193,16 @@ void MediaControls::reset()
makeOpaque();
}
+LayoutObject* MediaControls::layoutObjectForTextTrackLayout()
+{
+ return m_panel->layoutObject();
+}
+
void MediaControls::show()
{
makeOpaque();
- m_panel->setIsDisplayed(true);
m_panel->show();
philipj_slow 2015/03/20 05:58:19 This change of order isn't really needed, I just t
+ m_panel->setIsDisplayed(true);
if (m_overlayPlayButton)
m_overlayPlayButton->updateDisplayType();
}
@@ -212,8 +217,8 @@ void MediaControls::mediaElementFocused()
void MediaControls::hide()
{
- m_panel->setIsDisplayed(false);
m_panel->hide();
+ m_panel->setIsDisplayed(false);
if (m_overlayPlayButton)
m_overlayPlayButton->hide();
}

Powered by Google App Engine
This is Rietveld 408576698