OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv
ed. |
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 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1387 // zero-length cues. | 1387 // zero-length cues. |
1388 double endTime = max(cue->startTime(), cue->endTime()); | 1388 double endTime = max(cue->startTime(), cue->endTime()); |
1389 | 1389 |
1390 CueInterval interval = m_cueTree.createInterval(cue->startTime(), endTime, c
ue.get()); | 1390 CueInterval interval = m_cueTree.createInterval(cue->startTime(), endTime, c
ue.get()); |
1391 m_cueTree.remove(interval); | 1391 m_cueTree.remove(interval); |
1392 | 1392 |
1393 size_t index = m_currentlyActiveCues.find(interval); | 1393 size_t index = m_currentlyActiveCues.find(interval); |
1394 if (index != notFound) | 1394 if (index != notFound) |
1395 m_currentlyActiveCues.remove(index); | 1395 m_currentlyActiveCues.remove(index); |
1396 | 1396 |
| 1397 cue->removeDisplayTree(); |
1397 updateActiveTextTrackCues(currentTime()); | 1398 updateActiveTextTrackCues(currentTime()); |
1398 } | 1399 } |
1399 | 1400 |
1400 #endif | 1401 #endif |
1401 | 1402 |
1402 bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionI
fInvalid) | 1403 bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionI
fInvalid) |
1403 { | 1404 { |
1404 if (!url.isValid()) { | 1405 if (!url.isValid()) { |
1405 LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE because url i
s invalid", urlForLoggingMedia(url).utf8().data()); | 1406 LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE because url i
s invalid", urlForLoggingMedia(url).utf8().data()); |
1406 return false; | 1407 return false; |
(...skipping 3344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4751 info.addMember(m_mediaGroup); | 4752 info.addMember(m_mediaGroup); |
4752 info.addMember(m_mediaController); | 4753 info.addMember(m_mediaController); |
4753 | 4754 |
4754 #if PLATFORM(MAC) | 4755 #if PLATFORM(MAC) |
4755 info.addMember(m_sleepDisabler); | 4756 info.addMember(m_sleepDisabler); |
4756 #endif | 4757 #endif |
4757 } | 4758 } |
4758 | 4759 |
4759 } | 4760 } |
4760 #endif | 4761 #endif |
OLD | NEW |