Merge 21935 - Fixes an audio playback regression caused by seeking in audio/v...

chrome/renderer/media/audio_renderer_impl.cc

 // Copyright (c) 2009 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 "chrome/common/render_messages.h"
 #include "chrome/renderer/audio_message_filter.h"
 #include "chrome/renderer/media/audio_renderer_impl.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/render_thread.h"
 #include "media/base/filter_host.h"
@@ skipping 162 matching lines @@
     AutoLock auto_lock(lock_);
     DCHECK(!pending_request_);
     pending_request_ = true;
 
     // Use the information provided by the IPC message to adjust the playback
     // delay.
     request_timestamp_ = message_timestamp;
     request_delay_ = ConvertToDuration(bytes_in_buffer);
   }
 
-  // Try to fill in the fulfil the packet request.
+  // Try to fill in the fulfill the packet request.
   OnNotifyPacketReady();
 }
 
 void AudioRendererImpl::OnStateChanged(AudioOutputStream::State state,
                                        int info) {
   DCHECK(MessageLoop::current() == io_loop_);
 
   AutoLock auto_lock(lock_);
   if (stopped_)
     return;
@@ skipping 117 matching lines @@
           prerolling_ = false;
           preroll_bytes_ = 0;
           filter_->Send(new ViewHostMsg_StartAudioStream(0, stream_id_));
         } else {
           preroll_bytes_ -= filled;
         }
       }
     }
   }
 }