Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013, Opera Software ASA. All rights reserved. | 2 * Copyright (c) 2013, Opera Software ASA. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 enum CueAlignment { | 124 enum CueAlignment { |
| 125 Start = 0, | 125 Start = 0, |
| 126 Middle, | 126 Middle, |
| 127 End, | 127 End, |
| 128 Left, | 128 Left, |
| 129 Right, | 129 Right, |
| 130 NumberOfAlignments | 130 NumberOfAlignments |
| 131 }; | 131 }; |
| 132 CueAlignment getAlignment() const { return m_cueAlignment; } | 132 CueAlignment getAlignment() const { return m_cueAlignment; } |
| 133 | 133 |
| 134 virtual CueType cueType() const OVERRIDE { return WebVTT; } | |
| 135 | |
| 134 virtual ExecutionContext* executionContext() const OVERRIDE; | 136 virtual ExecutionContext* executionContext() const OVERRIDE; |
| 135 | 137 |
| 136 #ifndef NDEBUG | 138 #ifndef NDEBUG |
| 137 virtual String toString() const OVERRIDE; | 139 virtual String toString() const OVERRIDE; |
| 138 #endif | 140 #endif |
| 139 | 141 |
| 140 private: | 142 private: |
| 141 VTTCue(Document&, double startTime, double endTime, const String& text); | 143 VTTCue(Document&, double startTime, double endTime, const String& text); |
| 142 | 144 |
| 143 Document& document() const; | 145 Document& document() const; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 180 | 182 |
| 181 CSSValueID m_displayDirection; | 183 CSSValueID m_displayDirection; |
| 182 int m_displaySize; | 184 int m_displaySize; |
| 183 std::pair<float, float> m_displayPosition; | 185 std::pair<float, float> m_displayPosition; |
| 184 | 186 |
| 185 bool m_snapToLines : 1; | 187 bool m_snapToLines : 1; |
| 186 bool m_displayTreeShouldChange : 1; | 188 bool m_displayTreeShouldChange : 1; |
| 187 bool m_notifyRegion : 1; | 189 bool m_notifyRegion : 1; |
| 188 }; | 190 }; |
| 189 | 191 |
| 190 // VTTCue is currently the only TextTrackCue subclass. | 192 // VTTCue is currently the only TextTrackCue subclass. |
|
acolwell GONE FROM CHROMIUM
2014/04/04 23:25:27
nit: Please remove this comment now that it is no
| |
| 191 DEFINE_TYPE_CASTS(VTTCue, TextTrackCue, cue, true, true); | 193 DEFINE_TYPE_CASTS(VTTCue, TextTrackCue, cue, cue->cueType() == TextTrackCue::Web VTT, cue.cueType() == TextTrackCue::WebVTT); |
| 192 | 194 |
| 193 } // namespace WebCore | 195 } // namespace WebCore |
| 194 | 196 |
| 195 #endif | 197 #endif |
| OLD | NEW |