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

Unified Diff: Source/WebCore/html/HTMLMediaElement.cpp

Issue 7005009: Merge 84611 - <rdar://problem/9322486> REGRESSION (r83397): Default controls fade out when playin... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 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
« no previous file with comments | « LayoutTests/media/audio-controls-do-not-fade-out-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/HTMLMediaElement.cpp
===================================================================
--- Source/WebCore/html/HTMLMediaElement.cpp (revision 86180)
+++ Source/WebCore/html/HTMLMediaElement.cpp (working copy)
@@ -1615,7 +1615,7 @@
scheduleTimeupdateEvent(true);
if (hasMediaControls()) {
- if (!m_mouseOver && controls())
+ if (!m_mouseOver && controls() && hasVideo())
mediaControls()->makeTransparent();
mediaControls()->playbackProgressed();
}
« no previous file with comments | « LayoutTests/media/audio-controls-do-not-fade-out-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698