Renamed FilterHost::Error() and Pipeline::GetTime() to more appropriate names.

media/filters/video_renderer_base.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 "media/base/buffers.h"
 #include "media/base/filter_host.h"
 #include "media/filters/video_renderer_base.h"
 
 namespace media {
 
@@ skipping 89 matching lines @@
   DCHECK(callback);
   DCHECK_EQ(state_, UNINITIALIZED);
   state_ = INITIALIZING;
   decoder_ = decoder;
   initialize_callback_.reset(callback);
 
   // Notify the pipeline of the video dimensions.
   int width = 0;
   int height = 0;
   if (!ParseMediaFormat(decoder->media_format(), &width, &height)) {
-    host()->Error(PIPELINE_ERROR_INITIALIZATION_FAILED);
+    host()->SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
     initialize_callback_->Run();
     initialize_callback_.reset();
     return;
   }
   host()->SetVideoSize(width, height);
 
   // Initialize the subclass.
   // TODO(scherkus): do we trust subclasses not to do something silly while
   // we're holding the lock?
   if (!OnInitialize(decoder)) {
-    host()->Error(PIPELINE_ERROR_INITIALIZATION_FAILED);
+    host()->SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
     initialize_callback_->Run();
     initialize_callback_.reset();
     return;
   }
 
   // Create our video thread.
   if (!PlatformThread::Create(0, this, &thread_)) {
     NOTREACHED() << "Video thread creation failed";
-    host()->Error(PIPELINE_ERROR_INITIALIZATION_FAILED);
+    host()->SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
     initialize_callback_->Run();
     initialize_callback_.reset();
     return;
   }
 
 #if defined(OS_WIN)
   // Bump up our priority so our sleeping is more accurate.
   // TODO(scherkus): find out if this is necessary, but it seems to help.
   ::SetThreadPriority(thread_, THREAD_PRIORITY_ABOVE_NORMAL);
 #endif  // defined(OS_WIN)
@@ skipping 114 matching lines @@
     frame_available_.Signal();
   }
 
   // Check for our initialization condition.
   if (state_ == INITIALIZING &&
       (frames_.size() == kMaxFrames || frame->IsEndOfStream())) {
     if (frames_.empty()) {
       // We should have initialized but there's no decoded frames in the queue.
       // Raise an error.
       state_ = ERRORED;
-      host()->Error(PIPELINE_ERROR_NO_DATA);
+      host()->SetError(PIPELINE_ERROR_NO_DATA);
       initialize_callback_->Run();
       initialize_callback_.reset();
     } else {
       state_ = INITIALIZED;
       current_frame_ = frames_.front();
       initialize_callback_->Run();
       initialize_callback_.reset();
     }
   }
 }
@@ skipping 12 matching lines @@
   }
   if (state_ == STOPPED || state_ == ERRORED) {
     return false;
   }
   DCHECK_EQ(state_, INITIALIZED);
   DCHECK(current_frame_);
   return true;
 }
 
 }  // namespace media