Fix progress event not firing when load has completed.

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2011 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/glue/webmediaplayer_impl.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 807 matching lines @@
 
 void WebMediaPlayerImpl::OnNetworkEvent() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
     if (pipeline_->IsNetworkActive()) {
       SetNetworkState(WebKit::WebMediaPlayer::Loading);
     } else {
       // If we are inactive because we just finished receiving all the data,
       // do one final repaint to show final progress.
       if (bytesLoaded() == totalBytes() &&
-          network_state_ != WebKit::WebMediaPlayer::Idle)
+          network_state_ != WebKit::WebMediaPlayer::Idle) {
         Repaint();
+      }
+      if (network_state_ == WebKit::WebMediaPlayer::Loading) {
+        SetNetworkState(WebKit::WebMediaPlayer::Loaded);

[acolwell GONE FROM CHROMIUM, 2011/02/24 19:19:08]

Shouldn't this be inside the condition with the Repaint()? Then you at least
know that you are transitioning when you have downloaded all the bytes.

[sjl, 2011/02/24 21:24:41]

Good point. Fixed.

+      }
       SetNetworkState(WebKit::WebMediaPlayer::Idle);

[acolwell GONE FROM CHROMIUM, 2011/02/24 19:19:08]

Why is there an immediate transition from Loaded to Idle?

[sjl, 2011/02/24 21:24:41]

We need to switch to idle when we've finished downloading and we're done with
network activity, but before that we need to transition through the loaded state
(which was being skipped previously). It's in this transition that webkit sends
out the final progress event (as per spec).

     }
   }
 }
 
 void WebMediaPlayerImpl::SetNetworkState(
     WebKit::WebMediaPlayer::NetworkState state) {
   DCHECK(MessageLoop::current() == main_loop_);
   // Always notify to ensure client has the latest value.
   network_state_ = state;
   GetClient()->networkStateChanged();
@@ skipping 37 matching lines @@
   pipeline_stopped_.Signal();
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue