Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 18856005: Fix HTMLMediaElement so that it doesn't add cues for disabled text tracks. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index 7ae83aebde141b42b4a19eccf9140177ce630d31..218315ed24406dd055c7d0b331ed9dd88af6fb48 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -1262,9 +1262,10 @@ void HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests()
updateActiveTextTrackCues(currentTime());
}
-void HTMLMediaElement::textTrackAddCues(TextTrack*, const TextTrackCueList* cues)
+void HTMLMediaElement::textTrackAddCues(TextTrack* track, const TextTrackCueList* cues)
{
LOG(Media, "HTMLMediaElement::textTrackAddCues");
+ ASSERT(track->mode() != TextTrack::disabledKeyword());
adamk 2013/07/08 19:16:38 Not sure if we have any compilers that actually co
acolwell GONE FROM CHROMIUM 2013/07/08 19:25:48 Done.
TrackDisplayUpdateScope scope(this);
for (size_t i = 0; i < cues->length(); ++i)
« no previous file with comments | « no previous file | Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698