Made MediaFilter::host_ and MediaFilter::message_loop_ private.

media/filters/decoder_base.h

 // 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.
 
 // A base class that provides the plumbing for a decoder filters.
 
 #ifndef MEDIA_FILTERS_DECODER_BASE_H_
 #define MEDIA_FILTERS_DECODER_BASE_H_
 
 #include <deque>
 
 #include "base/lock.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/base/filter_host.h"
 
 namespace media {
 
 template <class Decoder, class Output>
 class DecoderBase : public Decoder {
  public:
   typedef CallbackRunner< Tuple1<Output*> > ReadCallback;
 
   // MediaFilter implementation.
   virtual void Stop() {
-    message_loop()->PostTask(FROM_HERE,
+    this->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::StopTask));
   }
 
   virtual void Seek(base::TimeDelta time) {
-    message_loop()->PostTask(FROM_HERE,
+    this->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::SeekTask, time));
   }
 
   // Decoder implementation.
   virtual bool Initialize(DemuxerStream* demuxer_stream) {
-    message_loop()->PostTask(FROM_HERE,
+    this->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::InitializeTask, demuxer_stream));
     return true;
   }
 
   virtual const MediaFormat& media_format() { return media_format_; }
 
   // Audio or video decoder.
   virtual void Read(ReadCallback* read_callback) {
-    message_loop()->PostTask(FROM_HERE,
+    this->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::ReadTask, read_callback));
   }
 
   void OnReadComplete(Buffer* buffer) {
     // Little bit of magic here to get NewRunnableMethod() to generate a Task
     // that holds onto a reference via scoped_refptr<>.
     //
     // TODO(scherkus): change the callback format to pass a scoped_refptr<> or
     // better yet see if we can get away with not using reference counting.
     scoped_refptr<Buffer> buffer_ref = buffer;
-    message_loop()->PostTask(FROM_HERE,
+    this->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::ReadCompleteTask, buffer_ref));
   }
 
  protected:
   DecoderBase()
       : pending_reads_(0),
         seeking_(false),
         state_(UNINITIALIZED),
         thread_id_(NULL) {
   }
@@ skipping 38 matching lines @@
   virtual void OnDecode(Buffer* input) = 0;
 
   // Used for subclasses who friend unit tests and need to set the thread id.
   virtual void set_thread_id(PlatformThreadId thread_id) {
     thread_id_ = thread_id;
   }
 
   MediaFormat media_format_;
 
  private:
-  // GCC doesn't let us access superclass member variables directly, so use
-  // a helper to get around the situation.
-  //
-  // TODO(scherkus): another reason to add protected accessors to MediaFilter.
-  FilterHost* host() const { return Decoder::host_; }
-  MessageLoop* message_loop() const { return Decoder::message_loop_; }
   bool IsStopped() { return state_ == STOPPED; }
 
   void StopTask() {
     DCHECK_EQ(PlatformThread::CurrentId(), thread_id_);
     // Delegate to the subclass first.
     OnStop();
 
     // Throw away all buffers in all queues.
     result_queue_.clear();
     STLDeleteElements(&read_queue_);
@@ skipping 17 matching lines @@
     DCHECK(state_ == UNINITIALIZED);
     DCHECK(!demuxer_stream_);
     DCHECK(!thread_id_ || thread_id_ == PlatformThread::CurrentId());
     demuxer_stream_ = demuxer_stream;
 
     // Grab the thread id for debugging.
     thread_id_ = PlatformThread::CurrentId();
 
     // Delegate to subclass first.
     if (!OnInitialize(demuxer_stream_)) {
-      host()->Error(PIPELINE_ERROR_DECODE);
+      this->host()->Error(PIPELINE_ERROR_DECODE);
       return;
     }
 
     // TODO(scherkus): subclass shouldn't mutate superclass media format.
     DCHECK(!media_format_.empty()) << "Subclass did not set media_format_";
     state_ = INITIALIZED;
-    host()->InitializationComplete();
+    this->host()->InitializationComplete();
   }
 
   void ReadTask(ReadCallback* read_callback) {
     DCHECK_EQ(PlatformThread::CurrentId(), thread_id_);
     // TODO(scherkus): should reply with a null operation (empty buffer).
     if (IsStopped()) {
       delete read_callback;
       return;
     }
 
@@ skipping 104 matching lines @@
 
   // Used for debugging.
   PlatformThreadId thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_BASE_H_