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

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

Issue 939193002: Remove TextTrackCue::notifyRegionWhenRemovingDisplayTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Hoist removeDisplayTree-call from setIsActive. Created 5 years, 10 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/TextTrackCueList.cpp ('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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 void parseSettings(const String&); 104 void parseSettings(const String&);
105 105
106 PassRefPtrWillBeRawPtr<DocumentFragment> getCueAsHTML(); 106 PassRefPtrWillBeRawPtr<DocumentFragment> getCueAsHTML();
107 107
108 const String& regionId() const { return m_regionId; } 108 const String& regionId() const { return m_regionId; }
109 void setRegionId(const String&); 109 void setRegionId(const String&);
110 110
111 virtual void updateDisplay(HTMLDivElement& container) override; 111 virtual void updateDisplay(HTMLDivElement& container) override;
112 112
113 virtual void updateDisplayTree(double movieTime) override; 113 virtual void updateDisplayTree(double movieTime) override;
114 virtual void removeDisplayTree() override; 114 virtual void removeDisplayTree(RemovalNotification) override;
115 virtual void notifyRegionWhenRemovingDisplayTree(bool notifyRegion) override ;
116 115
117 void markFutureAndPastNodes(ContainerNode*, double previousTimestamp, double movieTime); 116 void markFutureAndPastNodes(ContainerNode*, double previousTimestamp, double movieTime);
118 117
119 float calculateComputedLinePosition() const; 118 float calculateComputedLinePosition() const;
120 119
121 enum WritingDirection { 120 enum WritingDirection {
122 Horizontal = 0, 121 Horizontal = 0,
123 VerticalGrowingLeft, 122 VerticalGrowingLeft,
124 VerticalGrowingRight, 123 VerticalGrowingRight,
125 NumberOfWritingDirections 124 NumberOfWritingDirections
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 WritingDirection m_writingDirection; 181 WritingDirection m_writingDirection;
183 CueAlignment m_cueAlignment; 182 CueAlignment m_cueAlignment;
184 String m_regionId; 183 String m_regionId;
185 184
186 RefPtrWillBeMember<DocumentFragment> m_vttNodeTree; 185 RefPtrWillBeMember<DocumentFragment> m_vttNodeTree;
187 RefPtrWillBeMember<HTMLDivElement> m_cueBackgroundBox; 186 RefPtrWillBeMember<HTMLDivElement> m_cueBackgroundBox;
188 RefPtrWillBeMember<VTTCueBox> m_displayTree; 187 RefPtrWillBeMember<VTTCueBox> m_displayTree;
189 188
190 bool m_snapToLines : 1; 189 bool m_snapToLines : 1;
191 bool m_displayTreeShouldChange : 1; 190 bool m_displayTreeShouldChange : 1;
192 bool m_notifyRegion : 1;
193 }; 191 };
194 192
195 // VTTCue is currently the only TextTrackCue subclass. 193 // VTTCue is currently the only TextTrackCue subclass.
196 DEFINE_TYPE_CASTS(VTTCue, TextTrackCue, cue, true, true); 194 DEFINE_TYPE_CASTS(VTTCue, TextTrackCue, cue, true, true);
197 195
198 } // namespace blink 196 } // namespace blink
199 197
200 #endif // VTTCue_h 198 #endif // VTTCue_h
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackCueList.cpp ('k') | Source/core/html/track/vtt/VTTCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698