| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2011 Google Inc.  All rights reserved. | 2  * Copyright (C) 2011 Google Inc.  All rights reserved. | 
| 3  * Copyright (C) 2011, 2012, 2013 Apple Inc.  All rights reserved. | 3  * Copyright (C) 2011, 2012, 2013 Apple 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 are | 6  * modification, are permitted provided that the following conditions are | 
| 7  * met: | 7  * met: | 
| 8  * | 8  * | 
| 9  *     * Redistributions of source code must retain the above copyright | 9  *     * 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 441         m_renderedTrackIndex = m_trackList->getTrackIndexRelativeToRenderedTrack
     s(this); | 441         m_renderedTrackIndex = m_trackList->getTrackIndexRelativeToRenderedTrack
     s(this); | 
| 442 | 442 | 
| 443     return m_renderedTrackIndex; | 443     return m_renderedTrackIndex; | 
| 444 } | 444 } | 
| 445 | 445 | 
| 446 const AtomicString& TextTrack::interfaceName() const | 446 const AtomicString& TextTrack::interfaceName() const | 
| 447 { | 447 { | 
| 448     return EventTargetNames::TextTrack; | 448     return EventTargetNames::TextTrack; | 
| 449 } | 449 } | 
| 450 | 450 | 
| 451 ExecutionContext* TextTrack::executionContext() const | 451 ExecutionContext* TextTrack::getExecutionContext() const | 
| 452 { | 452 { | 
| 453     HTMLMediaElement* owner = mediaElement(); | 453     HTMLMediaElement* owner = mediaElement(); | 
| 454     return owner ? owner->executionContext() : 0; | 454     return owner ? owner->getExecutionContext() : 0; | 
| 455 } | 455 } | 
| 456 | 456 | 
| 457 HTMLMediaElement* TextTrack::mediaElement() const | 457 HTMLMediaElement* TextTrack::mediaElement() const | 
| 458 { | 458 { | 
| 459     return m_trackList ? m_trackList->owner() : 0; | 459     return m_trackList ? m_trackList->owner() : 0; | 
| 460 } | 460 } | 
| 461 | 461 | 
| 462 CueTimeline* TextTrack::cueTimeline() const | 462 CueTimeline* TextTrack::cueTimeline() const | 
| 463 { | 463 { | 
| 464     return mediaElement() ? &mediaElement()->cueTimeline() : nullptr; | 464     return mediaElement() ? &mediaElement()->cueTimeline() : nullptr; | 
| 465 } | 465 } | 
| 466 | 466 | 
| 467 Node* TextTrack::owner() const | 467 Node* TextTrack::owner() const | 
| 468 { | 468 { | 
| 469     return mediaElement(); | 469     return mediaElement(); | 
| 470 } | 470 } | 
| 471 | 471 | 
| 472 DEFINE_TRACE(TextTrack) | 472 DEFINE_TRACE(TextTrack) | 
| 473 { | 473 { | 
| 474     visitor->trace(m_cues); | 474     visitor->trace(m_cues); | 
| 475     visitor->trace(m_activeCues); | 475     visitor->trace(m_activeCues); | 
| 476     visitor->trace(m_regions); | 476     visitor->trace(m_regions); | 
| 477     visitor->trace(m_trackList); | 477     visitor->trace(m_trackList); | 
| 478     TrackBase::trace(visitor); | 478     TrackBase::trace(visitor); | 
| 479     RefCountedGarbageCollectedEventTargetWithInlineData<TextTrack>::trace(visito
     r); | 479     RefCountedGarbageCollectedEventTargetWithInlineData<TextTrack>::trace(visito
     r); | 
| 480 } | 480 } | 
| 481 | 481 | 
| 482 } // namespace blink | 482 } // namespace blink | 
| OLD | NEW | 
|---|