Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 275 { | 275 { |
| 276 makeOpaque(); | 276 makeOpaque(); |
| 277 m_panel->setIsWanted(true); | 277 m_panel->setIsWanted(true); |
| 278 m_panel->setIsDisplayed(true); | 278 m_panel->setIsDisplayed(true); |
| 279 if (m_overlayPlayButton) | 279 if (m_overlayPlayButton) |
| 280 m_overlayPlayButton->updateDisplayType(); | 280 m_overlayPlayButton->updateDisplayType(); |
| 281 } | 281 } |
| 282 | 282 |
| 283 void MediaControls::mediaElementFocused() | 283 void MediaControls::mediaElementFocused() |
| 284 { | 284 { |
| 285 mediaElement().recordShowControls(); | |
|
philipj_slow
2016/02/16 06:20:27
This case is akin to the mouse moving over the vid
mlamouri (slow - plz ping)
2016/02/18 15:49:31
Removed.
| |
| 285 if (mediaElement().shouldShowControls()) { | 286 if (mediaElement().shouldShowControls()) { |
| 286 show(); | 287 show(); |
| 287 resetHideMediaControlsTimer(); | 288 resetHideMediaControlsTimer(); |
| 288 } | 289 } |
| 289 } | 290 } |
| 290 | 291 |
| 291 void MediaControls::hide() | 292 void MediaControls::hide() |
| 292 { | 293 { |
| 293 m_panel->setIsWanted(false); | 294 m_panel->setIsWanted(false); |
| 294 m_panel->setIsDisplayed(false); | 295 m_panel->setIsDisplayed(false); |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 749 visitor->trace(m_toggleClosedCaptionsButton); | 750 visitor->trace(m_toggleClosedCaptionsButton); |
| 750 visitor->trace(m_fullScreenButton); | 751 visitor->trace(m_fullScreenButton); |
| 751 visitor->trace(m_durationDisplay); | 752 visitor->trace(m_durationDisplay); |
| 752 visitor->trace(m_enclosure); | 753 visitor->trace(m_enclosure); |
| 753 visitor->trace(m_castButton); | 754 visitor->trace(m_castButton); |
| 754 visitor->trace(m_overlayCastButton); | 755 visitor->trace(m_overlayCastButton); |
| 755 HTMLDivElement::trace(visitor); | 756 HTMLDivElement::trace(visitor); |
| 756 } | 757 } |
| 757 | 758 |
| 758 } // namespace blink | 759 } // namespace blink |
| OLD | NEW |