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

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

Issue 1014873004: Let CueTimeline::currentlyActiveCues() return by reference-to-const (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/track/CueTimeline.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // everything is handled through CSS. The caption box is on top of the 84 // everything is handled through CSS. The caption box is on top of the
85 // controls box, in a container set with the -webkit-box display property. 85 // controls box, in a container set with the -webkit-box display property.
86 86
87 // 6. Let tracks be the subset of video's list of text tracks that have as 87 // 6. Let tracks be the subset of video's list of text tracks that have as
88 // their rules for updating the text track rendering these rules for 88 // their rules for updating the text track rendering these rules for
89 // updating the display of WebVTT text tracks, and whose text track mode is 89 // updating the display of WebVTT text tracks, and whose text track mode is
90 // showing or showing by default. 90 // showing or showing by default.
91 // 7. Let cues be an empty list of text track cues. 91 // 7. Let cues be an empty list of text track cues.
92 // 8. For each track track in tracks, append to cues all the cues from 92 // 8. For each track track in tracks, append to cues all the cues from
93 // track's list of cues that have their text track cue active flag set. 93 // track's list of cues that have their text track cue active flag set.
94 CueList activeCues = video.cueTimeline().currentlyActiveCues(); 94 const CueList& activeCues = video.cueTimeline().currentlyActiveCues();
95 95
96 // 9. If reset is false, then, for each text track cue cue in cues: if cue's 96 // 9. If reset is false, then, for each text track cue cue in cues: if cue's
97 // text track cue display state has a set of CSS boxes, then add those boxes 97 // text track cue display state has a set of CSS boxes, then add those boxes
98 // to output, and remove cue from cues. 98 // to output, and remove cue from cues.
99 99
100 // There is nothing explicitly to be done here, as all the caching occurs 100 // There is nothing explicitly to be done here, as all the caching occurs
101 // within the TextTrackCue instance itself. If parameters of the cue change, 101 // within the TextTrackCue instance itself. If parameters of the cue change,
102 // the display tree is cleared. 102 // the display tree is cleared.
103 103
104 // 10. For each text track cue cue in cues that has not yet had 104 // 10. For each text track cue cue in cues that has not yet had
(...skipping 10 matching lines...) Expand all
115 } 115 }
116 116
117 // 11. Return output. 117 // 11. Return output.
118 if (hasChildren()) 118 if (hasChildren())
119 removeInlineStyleProperty(CSSPropertyDisplay); 119 removeInlineStyleProperty(CSSPropertyDisplay);
120 else 120 else
121 setInlineStyleProperty(CSSPropertyDisplay, CSSValueNone); 121 setInlineStyleProperty(CSSPropertyDisplay, CSSValueNone);
122 } 122 }
123 123
124 } // namespace blink 124 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/CueTimeline.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698