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

Unified Diff: webkit/media/buffered_resource_loader.cc

Issue 10700125: Fold RestartLoadingTask() into ReadCallback() as the method is called on the render thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/buffered_resource_loader.cc
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index 424c0d0d2dd70bfc7cceec6b20bbaf69990fd466..7ad3dab636191c8ad6248c93656434c2278fc45c 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -510,8 +510,7 @@ void BufferedResourceLoader::didFinishLoading(
return;
}
- // If there is a pending read but the request has ended, return with what
- // we have.
+ // Don't leave read callbacks hanging around.
if (HasPendingRead()) {
// Try to fulfill with what is in the buffer.
if (CanFulfillRead())
@@ -519,9 +518,6 @@ void BufferedResourceLoader::didFinishLoading(
else
DoneRead(kCacheMiss, 0);
}
-
- // There must not be any outstanding read request.
- DCHECK(!HasPendingRead());
}
void BufferedResourceLoader::didFail(
« webkit/media/buffered_data_source.cc ('K') | « webkit/media/buffered_data_source.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698