| 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 m_hideMediaControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHidingMe
diaControls, FROM_HERE); | 421 m_hideMediaControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHidingMe
diaControls, FROM_HERE); |
| 422 } | 422 } |
| 423 | 423 |
| 424 void MediaControls::stopHideMediaControlsTimer() | 424 void MediaControls::stopHideMediaControlsTimer() |
| 425 { | 425 { |
| 426 m_hideMediaControlsTimer.stop(); | 426 m_hideMediaControlsTimer.stop(); |
| 427 } | 427 } |
| 428 | 428 |
| 429 const AtomicString& MediaControls::shadowPseudoId() const | 429 const AtomicString& MediaControls::shadowPseudoId() const |
| 430 { | 430 { |
| 431 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); | 431 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls", AtomicStrin
g::ConstructFromLiteral)); |
| 432 return id; | 432 return id; |
| 433 } | 433 } |
| 434 | 434 |
| 435 bool MediaControls::containsRelatedTarget(Event* event) | 435 bool MediaControls::containsRelatedTarget(Event* event) |
| 436 { | 436 { |
| 437 if (!event->isMouseEvent()) | 437 if (!event->isMouseEvent()) |
| 438 return false; | 438 return false; |
| 439 EventTarget* relatedTarget = toMouseEvent(event)->relatedTarget(); | 439 EventTarget* relatedTarget = toMouseEvent(event)->relatedTarget(); |
| 440 if (!relatedTarget) | 440 if (!relatedTarget) |
| 441 return false; | 441 return false; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 visitor->trace(m_muteButton); | 492 visitor->trace(m_muteButton); |
| 493 visitor->trace(m_volumeSlider); | 493 visitor->trace(m_volumeSlider); |
| 494 visitor->trace(m_toggleClosedCaptionsButton); | 494 visitor->trace(m_toggleClosedCaptionsButton); |
| 495 visitor->trace(m_fullScreenButton); | 495 visitor->trace(m_fullScreenButton); |
| 496 visitor->trace(m_durationDisplay); | 496 visitor->trace(m_durationDisplay); |
| 497 visitor->trace(m_enclosure); | 497 visitor->trace(m_enclosure); |
| 498 HTMLDivElement::trace(visitor); | 498 HTMLDivElement::trace(visitor); |
| 499 } | 499 } |
| 500 | 500 |
| 501 } | 501 } |
| OLD | NEW |