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

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

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5
Patch Set: get-names-6: . Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2012, 2013 Apple 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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // If mode changes to disabled, remove this track's cues from the client 164 // If mode changes to disabled, remove this track's cues from the client
165 // because they will no longer be accessible from the cues() function. 165 // because they will no longer be accessible from the cues() function.
166 if (mode == disabledKeyword()) 166 if (mode == disabledKeyword())
167 cueTimeline()->removeCues(this, m_cues.get()); 167 cueTimeline()->removeCues(this, m_cues.get());
168 else if (mode != showingKeyword()) 168 else if (mode != showingKeyword())
169 cueTimeline()->hideCues(this, m_cues.get()); 169 cueTimeline()->hideCues(this, m_cues.get());
170 } 170 }
171 171
172 m_mode = mode; 172 m_mode = mode;
173 173
174 if (mode != disabledKeyword() && readinessState() == Loaded) { 174 if (mode != disabledKeyword() && getReadinessState() == Loaded) {
175 if (m_cues && cueTimeline()) 175 if (m_cues && cueTimeline())
176 cueTimeline()->addCues(this, m_cues.get()); 176 cueTimeline()->addCues(this, m_cues.get());
177 } 177 }
178 178
179 if (mediaElement()) 179 if (mediaElement())
180 mediaElement()->textTrackModeChanged(this); 180 mediaElement()->textTrackModeChanged(this);
181 } 181 }
182 182
183 TextTrackCueList* TextTrack::cues() 183 TextTrackCueList* TextTrack::cues()
184 { 184 {
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 { 473 {
474 visitor->trace(m_cues); 474 visitor->trace(m_cues);
475 visitor->trace(m_activeCues); 475 visitor->trace(m_activeCues);
476 visitor->trace(m_regions); 476 visitor->trace(m_regions);
477 visitor->trace(m_trackList); 477 visitor->trace(m_trackList);
478 TrackBase::trace(visitor); 478 TrackBase::trace(visitor);
479 RefCountedGarbageCollectedEventTargetWithInlineData<TextTrack>::trace(visito r); 479 RefCountedGarbageCollectedEventTargetWithInlineData<TextTrack>::trace(visito r);
480 } 480 }
481 481
482 } // namespace blink 482 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/TextTrack.h ('k') | third_party/WebKit/Source/core/html/track/TrackBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698