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

Side by Side Diff: Source/core/html/shadow/MediaControls.cpp

Issue 296743007: Prevent media controls from auto-hiding on audio-only content. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 m_panel->makeOpaque(); 202 m_panel->makeOpaque();
203 } 203 }
204 204
205 void MediaControls::makeTransparent() 205 void MediaControls::makeTransparent()
206 { 206 {
207 m_panel->makeTransparent(); 207 m_panel->makeTransparent();
208 } 208 }
209 209
210 bool MediaControls::shouldHideMediaControls() 210 bool MediaControls::shouldHideMediaControls()
211 { 211 {
212 return !m_panel->hovered(); 212 return !m_panel->hovered() && mediaElement().hasVideo();
213 } 213 }
214 214
215 void MediaControls::playbackStarted() 215 void MediaControls::playbackStarted()
216 { 216 {
217 m_currentTimeDisplay->show(); 217 m_currentTimeDisplay->show();
218 m_durationDisplay->hide(); 218 m_durationDisplay->hide();
219 219
220 updatePlayState(); 220 updatePlayState();
221 m_timeline->setPosition(mediaElement().currentTime()); 221 m_timeline->setPosition(mediaElement().currentTime());
222 updateCurrentTimeDisplay(); 222 updateCurrentTimeDisplay();
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 432
433 void MediaControls::updateTextTrackDisplay() 433 void MediaControls::updateTextTrackDisplay()
434 { 434 {
435 if (!m_textDisplayContainer) 435 if (!m_textDisplayContainer)
436 createTextTrackDisplay(); 436 createTextTrackDisplay();
437 437
438 m_textDisplayContainer->updateDisplay(); 438 m_textDisplayContainer->updateDisplay();
439 } 439 }
440 440
441 } 441 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698