Revert 118546 because it caused PrerenderHTML5VideoNetwork to timeout on windows and linux

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 683 matching lines @@
       UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive",
                             is_accelerated_compositing_active_);
     } else {
       GetClient()->disableAcceleratedCompositing();
     }
 
     if (pipeline_->IsLocalSource())
       SetNetworkState(WebKit::WebMediaPlayer::Loaded);
 
     SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
-    SetReadyState(WebKit::WebMediaPlayer::HaveFutureData);
+    // Fire canplaythrough immediately after playback begins because of
+    // crbug.com/106480.
+    // 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.
     // WebKit uses FormatError to indicate an error for bogus URL or bad file.
     // Since we are at the initialization stage we can safely treat every error
     // as format error. Should post a task to call to |webmediaplayer_|.
     SetNetworkState(WebKit::WebMediaPlayer::FormatError);
   }
 
   // Repaint to trigger UI update.
@@ skipping 65 matching lines @@
   Repaint();
 }
 
 void WebMediaPlayerImpl::OnNetworkEvent(NetworkEvent type) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   switch(type) {
     case media::DOWNLOAD_CONTINUED:
       SetNetworkState(WebKit::WebMediaPlayer::Loading);
       break;
     case media::DOWNLOAD_PAUSED:
-      if (!pipeline_->IsLocalSource())
-        SetNetworkState(WebKit::WebMediaPlayer::Idle);
+      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/106480.
+      // TODO(vrk): uncomment code below when bug above is fixed.
+      // SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   GetClient()->sourceOpened();
@@ skipping 92 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media