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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 8741003: Revert effects of r110733 because of silent WebRTC breakage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 22c24d3be8932abb4ba3db6bc2e1225817503bc2..941f88f3d053412163de40af6ac38c8cad5fe9a4 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -750,7 +750,10 @@ void WebMediaPlayerImpl::OnPipelineInitialize(PipelineStatus status) {
SetNetworkState(WebKit::WebMediaPlayer::Loaded);
SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
- SetReadyState(WebKit::WebMediaPlayer::HaveFutureData);
+ // Fire canplaythrough immediately after playback begins because of
+ // crbug.com/105163.
+ // TODO(vrk): set ready state to HaveFutureData when bug above is fixed.
+ SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
} else {
// TODO(hclam): should use |status| to determine the state
// properly and reports error using MediaError.
@@ -839,7 +842,10 @@ void WebMediaPlayerImpl::OnNetworkEvent(NetworkEvent type) {
SetNetworkState(WebKit::WebMediaPlayer::Idle);
break;
case media::CAN_PLAY_THROUGH:
- SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
+ // Temporarily disable delayed firing of CAN_PLAY_THROUGH due to
+ // crbug.com/105163.
+ // TODO(vrk): uncomment code below when bug above is fixed.
+ // SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
break;
default:
NOTREACHED();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698