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

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

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 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 * 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 // 2. If the text track's text track mode is not set to one of hidden or sho wing, abort these steps. 151 // 2. If the text track's text track mode is not set to one of hidden or sho wing, abort these steps.
152 if (ensureTrack()->mode() != TextTrack::hiddenKeyword() && ensureTrack()->mo de() != TextTrack::showingKeyword()) 152 if (ensureTrack()->mode() != TextTrack::hiddenKeyword() && ensureTrack()->mo de() != TextTrack::showingKeyword())
153 return; 153 return;
154 154
155 // 3. If the text track's track element does not have a media element as a p arent, abort these steps. 155 // 3. If the text track's track element does not have a media element as a p arent, abort these steps.
156 if (!mediaElement()) 156 if (!mediaElement())
157 return; 157 return;
158 158
159 // 4. Run the remainder of these steps in parallel, allowing whatever caused these steps to run to continue. 159 // 4. Run the remainder of these steps in parallel, allowing whatever caused these steps to run to continue.
160 m_loadTimer.startOneShot(0, FROM_HERE); 160 m_loadTimer.startOneShot(0, BLINK_FROM_HERE);
161 161
162 // 5. Top: Await a stable state. The synchronous section consists of the fol lowing steps. (The steps in the 162 // 5. Top: Await a stable state. The synchronous section consists of the fol lowing steps. (The steps in the
163 // synchronous section are marked with [X]) 163 // synchronous section are marked with [X])
164 // FIXME: We use a timer to approximate a "stable state" - i.e. this is not 100% per spec. 164 // FIXME: We use a timer to approximate a "stable state" - i.e. this is not 100% per spec.
165 } 165 }
166 166
167 void HTMLTrackElement::loadTimerFired(Timer<HTMLTrackElement>*) 167 void HTMLTrackElement::loadTimerFired(Timer<HTMLTrackElement>*)
168 { 168 {
169 WTF_LOG(Media, "HTMLTrackElement::loadTimerFired"); 169 WTF_LOG(Media, "HTMLTrackElement::loadTimerFired");
170 170
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 329 }
330 330
331 DEFINE_TRACE(HTMLTrackElement) 331 DEFINE_TRACE(HTMLTrackElement)
332 { 332 {
333 visitor->trace(m_track); 333 visitor->trace(m_track);
334 visitor->trace(m_loader); 334 visitor->trace(m_loader);
335 HTMLElement::trace(visitor); 335 HTMLElement::trace(visitor);
336 } 336 }
337 337
338 } 338 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLMediaElement.cpp ('k') | third_party/WebKit/Source/core/html/MediaController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698