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

Side by Side Diff: Source/core/html/track/vtt/VTTCue.h

Issue 104243003: Merge bools into bit fields in TextTrackCue and VTTCue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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/TextTrackCue.h ('k') | Source/core/html/track/vtt/VTTCue.cpp » ('j') | 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) 2013, Opera Software ASA. All rights reserved. 2 * Copyright (c) 2013, Opera Software ASA. 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
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 RegionId 165 RegionId
166 }; 166 };
167 CueSetting settingName(const String&); 167 CueSetting settingName(const String&);
168 168
169 String m_text; 169 String m_text;
170 int m_linePosition; 170 int m_linePosition;
171 int m_computedLinePosition; 171 int m_computedLinePosition;
172 int m_textPosition; 172 int m_textPosition;
173 int m_cueSize; 173 int m_cueSize;
174 WritingDirection m_writingDirection; 174 WritingDirection m_writingDirection;
175
176 CueAlignment m_cueAlignment; 175 CueAlignment m_cueAlignment;
176 String m_regionId;
177 177
178 RefPtr<DocumentFragment> m_vttNodeTree; 178 RefPtr<DocumentFragment> m_vttNodeTree;
179 bool m_snapToLines;
180
181 RefPtr<HTMLDivElement> m_cueBackgroundBox; 179 RefPtr<HTMLDivElement> m_cueBackgroundBox;
182
183 bool m_displayTreeShouldChange;
184 RefPtr<VTTCueBox> m_displayTree; 180 RefPtr<VTTCueBox> m_displayTree;
185 181
186 CSSValueID m_displayDirection; 182 CSSValueID m_displayDirection;
183 int m_displaySize;
184 std::pair<float, float> m_displayPosition;
187 185
188 int m_displaySize; 186 bool m_snapToLines : 1;
189 187 bool m_displayTreeShouldChange : 1;
190 std::pair<float, float> m_displayPosition; 188 bool m_notifyRegion : 1;
191 String m_regionId;
192 bool m_notifyRegion;
193 }; 189 };
194 190
195 inline VTTCue* toVTTCue(TextTrackCue* cue) 191 inline VTTCue* toVTTCue(TextTrackCue* cue)
196 { 192 {
197 // VTTCue is currently the only TextTrackCue subclass. 193 // VTTCue is currently the only TextTrackCue subclass.
198 return static_cast<VTTCue*>(cue); 194 return static_cast<VTTCue*>(cue);
199 } 195 }
200 196
201 } // namespace WebCore 197 } // namespace WebCore
202 198
203 #endif 199 #endif
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackCue.h ('k') | Source/core/html/track/vtt/VTTCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698