| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/html/track/LoadableTextTrack.h" | 27 #include "core/html/track/LoadableTextTrack.h" |
| 28 | 28 |
| 29 #include "core/dom/ElementTraversal.h" |
| 29 #include "core/html/HTMLTrackElement.h" | 30 #include "core/html/HTMLTrackElement.h" |
| 30 #include "core/html/track/TextTrackCueList.h" | 31 #include "core/html/track/TextTrackCueList.h" |
| 31 #include "core/html/track/vtt/VTTRegionList.h" | 32 #include "core/html/track/vtt/VTTRegionList.h" |
| 32 | 33 |
| 33 namespace WebCore { | 34 namespace WebCore { |
| 34 | 35 |
| 35 using namespace HTMLNames; | 36 using namespace HTMLNames; |
| 36 | 37 |
| 37 LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track) | 38 LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track) |
| 38 : TextTrack(track->document(), track, emptyAtom, emptyAtom, emptyAtom, empty
Atom, TrackElement) | 39 : TextTrack(track->document(), track, emptyAtom, emptyAtom, emptyAtom, empty
Atom, TrackElement) |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 regions()->add(newRegions[i]); | 137 regions()->add(newRegions[i]); |
| 137 } | 138 } |
| 138 } | 139 } |
| 139 | 140 |
| 140 size_t LoadableTextTrack::trackElementIndex() | 141 size_t LoadableTextTrack::trackElementIndex() |
| 141 { | 142 { |
| 142 ASSERT(m_trackElement); | 143 ASSERT(m_trackElement); |
| 143 ASSERT(m_trackElement->parentNode()); | 144 ASSERT(m_trackElement->parentNode()); |
| 144 | 145 |
| 145 size_t index = 0; | 146 size_t index = 0; |
| 146 for (Node* node = m_trackElement->parentNode()->firstChild(); node; node = n
ode->nextSibling()) { | 147 for (Element* child = ElementTraversal::firstWithin(*m_trackElement->parentN
ode()); child; child = ElementTraversal::nextSibling(*child)) { |
| 147 if (!node->hasTagName(trackTag) || !node->parentNode()) | 148 if (!child->hasTagName(trackTag) || !child->parentNode()) |
| 148 continue; | 149 continue; |
| 149 if (node == m_trackElement) | 150 if (child == m_trackElement) |
| 150 return index; | 151 return index; |
| 151 ++index; | 152 ++index; |
| 152 } | 153 } |
| 153 ASSERT_NOT_REACHED(); | 154 ASSERT_NOT_REACHED(); |
| 154 | 155 |
| 155 return 0; | 156 return 0; |
| 156 } | 157 } |
| 157 | 158 |
| 158 } // namespace WebCore | 159 } // namespace WebCore |
| 159 | 160 |
| OLD | NEW |