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

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

Issue 363563007: Only show overlay play button when controls are enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@shouldShowControls
Patch Set: Extended test coverage Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 m_fullScreenButton->hide(); 184 m_fullScreenButton->hide();
185 185
186 makeOpaque(); 186 makeOpaque();
187 } 187 }
188 188
189 void MediaControls::show() 189 void MediaControls::show()
190 { 190 {
191 makeOpaque(); 191 makeOpaque();
192 m_panel->setIsDisplayed(true); 192 m_panel->setIsDisplayed(true);
193 m_panel->show(); 193 m_panel->show();
194 if (m_overlayPlayButton)
195 m_overlayPlayButton->updateDisplayType();
194 } 196 }
195 197
196 void MediaControls::mediaElementFocused() 198 void MediaControls::mediaElementFocused()
197 { 199 {
198 show(); 200 show();
199 stopHideMediaControlsTimer(); 201 stopHideMediaControlsTimer();
200 } 202 }
201 203
202 void MediaControls::hide() 204 void MediaControls::hide()
203 { 205 {
204 m_panel->setIsDisplayed(false); 206 m_panel->setIsDisplayed(false);
205 m_panel->hide(); 207 m_panel->hide();
208 if (m_overlayPlayButton)
209 m_overlayPlayButton->hide();
206 } 210 }
207 211
208 void MediaControls::makeOpaque() 212 void MediaControls::makeOpaque()
209 { 213 {
210 m_panel->makeOpaque(); 214 m_panel->makeOpaque();
211 } 215 }
212 216
213 void MediaControls::makeTransparent() 217 void MediaControls::makeTransparent()
214 { 218 {
215 m_panel->makeTransparent(); 219 m_panel->makeTransparent();
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 visitor->trace(m_muteButton); 476 visitor->trace(m_muteButton);
473 visitor->trace(m_volumeSlider); 477 visitor->trace(m_volumeSlider);
474 visitor->trace(m_toggleClosedCaptionsButton); 478 visitor->trace(m_toggleClosedCaptionsButton);
475 visitor->trace(m_fullScreenButton); 479 visitor->trace(m_fullScreenButton);
476 visitor->trace(m_durationDisplay); 480 visitor->trace(m_durationDisplay);
477 visitor->trace(m_enclosure); 481 visitor->trace(m_enclosure);
478 HTMLDivElement::trace(visitor); 482 HTMLDivElement::trace(visitor);
479 } 483 }
480 484
481 } 485 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698