| 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 void MediaControls::resetHideMediaControlsTimer() | 491 void MediaControls::resetHideMediaControlsTimer() |
| 492 { | 492 { |
| 493 stopHideMediaControlsTimer(); | 493 stopHideMediaControlsTimer(); |
| 494 if (!mediaElement().paused()) | 494 if (!mediaElement().paused()) |
| 495 startHideMediaControlsTimer(); | 495 startHideMediaControlsTimer(); |
| 496 } | 496 } |
| 497 | 497 |
| 498 | 498 |
| 499 const AtomicString& MediaControls::shadowPseudoId() const | 499 const AtomicString& MediaControls::shadowPseudoId() const |
| 500 { | 500 { |
| 501 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls", AtomicStrin
g::ConstructFromLiteral)); | 501 DEFINE_STATIC_LOCAL(AtomicString, id, ("-internal-media-controls", AtomicStr
ing::ConstructFromLiteral)); |
| 502 return id; | 502 return id; |
| 503 } | 503 } |
| 504 | 504 |
| 505 bool MediaControls::containsRelatedTarget(Event* event) | 505 bool MediaControls::containsRelatedTarget(Event* event) |
| 506 { | 506 { |
| 507 if (!event->isMouseEvent()) | 507 if (!event->isMouseEvent()) |
| 508 return false; | 508 return false; |
| 509 EventTarget* relatedTarget = toMouseEvent(event)->relatedTarget(); | 509 EventTarget* relatedTarget = toMouseEvent(event)->relatedTarget(); |
| 510 if (!relatedTarget) | 510 if (!relatedTarget) |
| 511 return false; | 511 return false; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 visitor->trace(m_toggleClosedCaptionsButton); | 564 visitor->trace(m_toggleClosedCaptionsButton); |
| 565 visitor->trace(m_fullScreenButton); | 565 visitor->trace(m_fullScreenButton); |
| 566 visitor->trace(m_durationDisplay); | 566 visitor->trace(m_durationDisplay); |
| 567 visitor->trace(m_enclosure); | 567 visitor->trace(m_enclosure); |
| 568 visitor->trace(m_castButton); | 568 visitor->trace(m_castButton); |
| 569 visitor->trace(m_overlayCastButton); | 569 visitor->trace(m_overlayCastButton); |
| 570 HTMLDivElement::trace(visitor); | 570 HTMLDivElement::trace(visitor); |
| 571 } | 571 } |
| 572 | 572 |
| 573 } | 573 } |
| OLD | NEW |