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

Side by Side Diff: third_party/WebKit/Source/core/loader/TextTrackLoader.cpp

Issue 1998553002: media: Replace wtf/Assertions.h macros in favor of base/logging.h macros (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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
« no previous file with comments | « third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp ('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) 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 m_cueLoadTimer.startOneShot(0, BLINK_FROM_HERE); 131 m_cueLoadTimer.startOneShot(0, BLINK_FROM_HERE);
132 } 132 }
133 133
134 void TextTrackLoader::newRegionsParsed() 134 void TextTrackLoader::newRegionsParsed()
135 { 135 {
136 m_client->newRegionsAvailable(this); 136 m_client->newRegionsAvailable(this);
137 } 137 }
138 138
139 void TextTrackLoader::fileFailedToParse() 139 void TextTrackLoader::fileFailedToParse()
140 { 140 {
141 WTF_LOG(Media, "TextTrackLoader::fileFailedToParse");
142
143 m_state = Failed; 141 m_state = Failed;
144 142
145 if (!m_cueLoadTimer.isActive()) 143 if (!m_cueLoadTimer.isActive())
146 m_cueLoadTimer.startOneShot(0, BLINK_FROM_HERE); 144 m_cueLoadTimer.startOneShot(0, BLINK_FROM_HERE);
147 145
148 cancelLoad(); 146 cancelLoad();
149 } 147 }
150 148
151 void TextTrackLoader::getNewCues(HeapVector<Member<TextTrackCue>>& outputCues) 149 void TextTrackLoader::getNewCues(HeapVector<Member<TextTrackCue>>& outputCues)
152 { 150 {
(...skipping 12 matching lines...) Expand all
165 DEFINE_TRACE(TextTrackLoader) 163 DEFINE_TRACE(TextTrackLoader)
166 { 164 {
167 visitor->trace(m_client); 165 visitor->trace(m_client);
168 visitor->trace(m_cueParser); 166 visitor->trace(m_cueParser);
169 visitor->trace(m_document); 167 visitor->trace(m_document);
170 ResourceOwner<RawResource>::trace(visitor); 168 ResourceOwner<RawResource>::trace(visitor);
171 VTTParserClient::trace(visitor); 169 VTTParserClient::trace(visitor);
172 } 170 }
173 171
174 } // namespace blink 172 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698