| 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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 m_isMouseOverControls = false; | 626 m_isMouseOverControls = false; |
| 627 stopHideMediaControlsTimer(); | 627 stopHideMediaControlsTimer(); |
| 628 } | 628 } |
| 629 return; | 629 return; |
| 630 } | 630 } |
| 631 | 631 |
| 632 if (event->type() == EventTypeNames::mousemove) { | 632 if (event->type() == EventTypeNames::mousemove) { |
| 633 // When we get a mouse move, show the media controls, and start a timer | 633 // When we get a mouse move, show the media controls, and start a timer |
| 634 // that will hide the media controls after a 3 seconds without a mouse move. | 634 // that will hide the media controls after a 3 seconds without a mouse move. |
| 635 makeOpaque(); | 635 makeOpaque(); |
| 636 refreshCastButtonVisibility(); | |
| 637 if (shouldHideMediaControls(IgnoreVideoHover)) | 636 if (shouldHideMediaControls(IgnoreVideoHover)) |
| 638 startHideMediaControlsTimer(); | 637 startHideMediaControlsTimer(); |
| 639 return; | 638 return; |
| 640 } | 639 } |
| 641 } | 640 } |
| 642 | 641 |
| 643 void MediaControls::hideMediaControlsTimerFired(TimerBase*) { | 642 void MediaControls::hideMediaControlsTimerFired(TimerBase*) { |
| 644 unsigned behaviorFlags = | 643 unsigned behaviorFlags = |
| 645 m_hideTimerBehaviorFlags | IgnoreFocus | IgnoreVideoHover; | 644 m_hideTimerBehaviorFlags | IgnoreFocus | IgnoreVideoHover; |
| 646 m_hideTimerBehaviorFlags = IgnoreNone; | 645 m_hideTimerBehaviorFlags = IgnoreNone; |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 972 visitor->trace(m_overflowList); | 971 visitor->trace(m_overflowList); |
| 973 visitor->trace(m_castButton); | 972 visitor->trace(m_castButton); |
| 974 visitor->trace(m_overlayCastButton); | 973 visitor->trace(m_overlayCastButton); |
| 975 visitor->trace(m_mediaEventListener); | 974 visitor->trace(m_mediaEventListener); |
| 976 visitor->trace(m_windowEventListener); | 975 visitor->trace(m_windowEventListener); |
| 977 visitor->trace(m_orientationLockDelegate); | 976 visitor->trace(m_orientationLockDelegate); |
| 978 HTMLDivElement::trace(visitor); | 977 HTMLDivElement::trace(visitor); |
| 979 } | 978 } |
| 980 | 979 |
| 981 } // namespace blink | 980 } // namespace blink |
| OLD | NEW |