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

Side by Side Diff: third_party/WebKit/Source/core/html/track/TextTrackContainer.cpp

Issue 2003543002: media/track: Replace wtf/Assertions.h macros in favor of base/logging.h macros (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google 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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 if (reset) 108 if (reset)
109 removeChildren(); 109 removeChildren();
110 110
111 // 10. For each text track cue cue in cues that has not yet had 111 // 10. For each text track cue cue in cues that has not yet had
112 // corresponding CSS boxes added to output, in text track cue order, run the 112 // corresponding CSS boxes added to output, in text track cue order, run the
113 // following substeps: 113 // following substeps:
114 double movieTime = video.currentTime(); 114 double movieTime = video.currentTime();
115 for (size_t i = 0; i < activeCues.size(); ++i) { 115 for (size_t i = 0; i < activeCues.size(); ++i) {
116 TextTrackCue* cue = activeCues[i].data(); 116 TextTrackCue* cue = activeCues[i].data();
117 117
118 ASSERT(cue->isActive()); 118 DCHECK(cue->isActive());
119 if (!cue->track() || !cue->track()->isRendered() || !cue->isActive()) 119 if (!cue->track() || !cue->track()->isRendered() || !cue->isActive())
120 continue; 120 continue;
121 121
122 cue->updateDisplay(*this); 122 cue->updateDisplay(*this);
123 cue->updatePastAndFutureNodes(movieTime); 123 cue->updatePastAndFutureNodes(movieTime);
124 } 124 }
125 125
126 // 11. Return output. 126 // 11. Return output.
127 // See the note for step 3 for why there is no output to return. 127 // See the note for step 3 for why there is no output to return.
128 } 128 }
129 129
130 } // namespace blink 130 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/TextTrack.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrackCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698