| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 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 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 451 |
| 452 disableShowingTextTracks(); | 452 disableShowingTextTracks(); |
| 453 int trackIndex = | 453 int trackIndex = |
| 454 toElement(target)->getIntegralAttribute(trackIndexAttrName()); | 454 toElement(target)->getIntegralAttribute(trackIndexAttrName()); |
| 455 if (trackIndex != trackIndexOffValue) { | 455 if (trackIndex != trackIndexOffValue) { |
| 456 DCHECK_GE(trackIndex, 0); | 456 DCHECK_GE(trackIndex, 0); |
| 457 showTextTrackAtIndex(trackIndex); | 457 showTextTrackAtIndex(trackIndex); |
| 458 mediaElement().disableAutomaticTextTrackSelection(); | 458 mediaElement().disableAutomaticTextTrackSelection(); |
| 459 } | 459 } |
| 460 | 460 |
| 461 mediaControls().toggleTextTrackList(); | |
| 462 event->setDefaultHandled(); | 461 event->setDefaultHandled(); |
| 463 } | 462 } |
| 464 MediaControlDivElement::defaultEventHandler(event); | 463 MediaControlDivElement::defaultEventHandler(event); |
| 465 } | 464 } |
| 466 | 465 |
| 467 void MediaControlTextTrackListElement::setVisible(bool visible) { | 466 void MediaControlTextTrackListElement::setVisible(bool visible) { |
| 468 if (visible) { | 467 if (visible) { |
| 469 setIsWanted(true); | 468 setIsWanted(true); |
| 470 refreshTextTrackListMenu(); | 469 refreshTextTrackListMenu(); |
| 471 } else { | 470 } else { |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 MediaControlCurrentTimeDisplayElement* | 1016 MediaControlCurrentTimeDisplayElement* |
| 1018 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) { | 1017 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) { |
| 1019 MediaControlCurrentTimeDisplayElement* element = | 1018 MediaControlCurrentTimeDisplayElement* element = |
| 1020 new MediaControlCurrentTimeDisplayElement(mediaControls); | 1019 new MediaControlCurrentTimeDisplayElement(mediaControls); |
| 1021 element->setShadowPseudoId( | 1020 element->setShadowPseudoId( |
| 1022 AtomicString("-webkit-media-controls-current-time-display")); | 1021 AtomicString("-webkit-media-controls-current-time-display")); |
| 1023 return element; | 1022 return element; |
| 1024 } | 1023 } |
| 1025 | 1024 |
| 1026 } // namespace blink | 1025 } // namespace blink |
| OLD | NEW |