From 3953428eedab395e93faf28ee21270d748ca74b9 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Tue, 31 Mar 2009 23:45:46 +0000 Subject: Re-enabling ENABLE_VIDEO since and made appropriate changes due toWebKit merge since r41907 (http://trac.webkit.org/changeset/41907).Changes include change names of state enums and adding method tosupport added state change event in WebCore::MediaPlayer. Review URL: http://codereview.chromium.org/56038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12917 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/webmediaplayer_delegate_impl.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/renderer/webmediaplayer_delegate_impl.cc') diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc index a39fa59..04e992b 100644 --- a/chrome/renderer/webmediaplayer_delegate_impl.cc +++ b/chrome/renderer/webmediaplayer_delegate_impl.cc @@ -47,7 +47,7 @@ class NotifyWebMediaPlayerTask : public CancelableTask { WebMediaPlayerDelegateImpl::WebMediaPlayerDelegateImpl(RenderView* view) : network_state_(webkit_glue::WebMediaPlayer::EMPTY), - ready_state_(webkit_glue::WebMediaPlayer::DATA_UNAVAILABLE), + ready_state_(webkit_glue::WebMediaPlayer::HAVE_NOTHING), main_loop_(NULL), filter_factory_(new media::FilterFactoryCollection()), audio_renderer_(NULL), @@ -292,13 +292,13 @@ void WebMediaPlayerDelegateImpl::DidInitializePipeline(bool successful) { if (successful) { // Since we have initialized the pipeline, we should be able to play it. // And we skip LOADED_METADATA state and starting with LOADED_FIRST_FRAME. - ready_state_ = webkit_glue::WebMediaPlayer::CAN_PLAY_THROUGH; + ready_state_ = webkit_glue::WebMediaPlayer::HAVE_ENOUGH_DATA; network_state_ = webkit_glue::WebMediaPlayer::LOADED; } else { // TODO(hclam): should use pipeline_.GetError() to determine the state // properly and reports error using MediaError. - ready_state_ = webkit_glue::WebMediaPlayer::DATA_UNAVAILABLE; - network_state_ = webkit_glue::WebMediaPlayer::LOAD_FAILED; + ready_state_ = webkit_glue::WebMediaPlayer::HAVE_NOTHING; + network_state_ = webkit_glue::WebMediaPlayer::NETWORK_ERROR; } PostTask(kNetworkStateTaskIndex, -- cgit v1.1