| 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 | 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58     TextTrackList* trackList() { return m_trackList; } | 58     TextTrackList* trackList() { return m_trackList; } | 
| 59 | 59 | 
| 60     virtual void setKind(const AtomicString&) override; | 60     virtual void setKind(const AtomicString&) override; | 
| 61 | 61 | 
| 62     static const AtomicString& subtitlesKeyword(); | 62     static const AtomicString& subtitlesKeyword(); | 
| 63     static const AtomicString& captionsKeyword(); | 63     static const AtomicString& captionsKeyword(); | 
| 64     static const AtomicString& descriptionsKeyword(); | 64     static const AtomicString& descriptionsKeyword(); | 
| 65     static const AtomicString& chaptersKeyword(); | 65     static const AtomicString& chaptersKeyword(); | 
| 66     static const AtomicString& metadataKeyword(); | 66     static const AtomicString& metadataKeyword(); | 
| 67     static bool isValidKindKeyword(const AtomicString&); | 67     static bool isValidKindKeyword(const AtomicString&); | 
|  | 68     static bool isValidKindKeyword(const String&); | 
| 68 | 69 | 
| 69     static const AtomicString& disabledKeyword(); | 70     static const AtomicString& disabledKeyword(); | 
| 70     static const AtomicString& hiddenKeyword(); | 71     static const AtomicString& hiddenKeyword(); | 
| 71     static const AtomicString& showingKeyword(); | 72     static const AtomicString& showingKeyword(); | 
| 72 | 73 | 
| 73     AtomicString mode() const { return m_mode; } | 74     AtomicString mode() const { return m_mode; } | 
| 74     virtual void setMode(const AtomicString&); | 75     virtual void setMode(const AtomicString&); | 
| 75 | 76 | 
| 76     enum ReadinessState { NotLoaded = 0, Loading = 1, Loaded = 2, FailedToLoad =
      3 }; | 77     enum ReadinessState { NotLoaded = 0, Loading = 1, Loaded = 2, FailedToLoad =
      3 }; | 
| 77     ReadinessState readinessState() const { return m_readinessState; } | 78     ReadinessState readinessState() const { return m_readinessState; } | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 139     int m_trackIndex; | 140     int m_trackIndex; | 
| 140     int m_renderedTrackIndex; | 141     int m_renderedTrackIndex; | 
| 141     bool m_hasBeenConfigured; | 142     bool m_hasBeenConfigured; | 
| 142 }; | 143 }; | 
| 143 | 144 | 
| 144 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); | 145 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); | 
| 145 | 146 | 
| 146 } // namespace blink | 147 } // namespace blink | 
| 147 | 148 | 
| 148 #endif // TextTrack_h | 149 #endif // TextTrack_h | 
| OLD | NEW | 
|---|