| 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 134     if (value == descriptionsKeyword()) | 134     if (value == descriptionsKeyword()) | 
| 135         return true; | 135         return true; | 
| 136     if (value == chaptersKeyword()) | 136     if (value == chaptersKeyword()) | 
| 137         return true; | 137         return true; | 
| 138     if (value == metadataKeyword()) | 138     if (value == metadataKeyword()) | 
| 139         return true; | 139         return true; | 
| 140 | 140 | 
| 141     return false; | 141     return false; | 
| 142 } | 142 } | 
| 143 | 143 | 
|  | 144 bool TextTrack::isValidKindKeyword(const String& value) | 
|  | 145 { | 
|  | 146     if (value == subtitlesKeyword()) | 
|  | 147         return true; | 
|  | 148     if (value == captionsKeyword()) | 
|  | 149         return true; | 
|  | 150     if (value == descriptionsKeyword()) | 
|  | 151         return true; | 
|  | 152     if (value == chaptersKeyword()) | 
|  | 153         return true; | 
|  | 154     if (value == metadataKeyword()) | 
|  | 155         return true; | 
|  | 156 | 
|  | 157     return false; | 
|  | 158 } | 
|  | 159 | 
| 144 void TextTrack::setTrackList(TextTrackList* trackList) | 160 void TextTrack::setTrackList(TextTrackList* trackList) | 
| 145 { | 161 { | 
| 146     if (!trackList && mediaElement() && m_cues) | 162     if (!trackList && mediaElement() && m_cues) | 
| 147         mediaElement()->textTrackRemoveCues(this, m_cues.get()); | 163         mediaElement()->textTrackRemoveCues(this, m_cues.get()); | 
| 148 | 164 | 
| 149     m_trackList = trackList; | 165     m_trackList = trackList; | 
| 150     invalidateTrackIndex(); | 166     invalidateTrackIndex(); | 
| 151 } | 167 } | 
| 152 | 168 | 
| 153 void TextTrack::setKind(const AtomicString& newKind) | 169 void TextTrack::setKind(const AtomicString& newKind) | 
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 440 void TextTrack::trace(Visitor* visitor) | 456 void TextTrack::trace(Visitor* visitor) | 
| 441 { | 457 { | 
| 442     visitor->trace(m_cues); | 458     visitor->trace(m_cues); | 
| 443     visitor->trace(m_regions); | 459     visitor->trace(m_regions); | 
| 444     visitor->trace(m_trackList); | 460     visitor->trace(m_trackList); | 
| 445     TrackBase::trace(visitor); | 461     TrackBase::trace(visitor); | 
| 446     EventTargetWithInlineData::trace(visitor); | 462     EventTargetWithInlineData::trace(visitor); | 
| 447 } | 463 } | 
| 448 | 464 | 
| 449 } // namespace blink | 465 } // namespace blink | 
| OLD | NEW | 
|---|