Rename ChromotingPlugin -> ChromotingInstance to be more consistent with...

remoting/client/plugin/pepper_view.cc

 // Copyright (c) 2010 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 "remoting/client/plugin/pepper_view.h"
 
 #include "base/message_loop.h"
 #include "remoting/base/decoder_zlib.h"
-#include "remoting/client/plugin/chromoting_plugin.h"
+#include "remoting/client/plugin/chromoting_instance.h"
 #include "remoting/client/plugin/pepper_util.h"
 #include "third_party/ppapi/cpp/device_context_2d.h"
 #include "third_party/ppapi/cpp/image_data.h"
 #include "third_party/ppapi/cpp/point.h"
 #include "third_party/ppapi/cpp/size.h"
 
 namespace remoting {
 
-PepperView::PepperView(ChromotingPlugin* plugin)
-  : plugin_(plugin),
+PepperView::PepperView(ChromotingInstance* instance)
+  : instance_(instance),
     backing_store_width_(0),
     backing_store_height_(0),
     viewport_x_(0),
     viewport_y_(0),
     viewport_width_(0),
     viewport_height_(0),
     is_static_fill_(false),
     static_fill_color_(0) {
 }
 
 PepperView::~PepperView() {
 }
 
 bool PepperView::Initialize() {
   return true;
 }
 
 void PepperView::TearDown() {
 }
 
 void PepperView::Paint() {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(NewRunnableMethod(this, &PepperView::Paint));
     return;
   }
 
   // TODO(ajwong): We're assuming the native format is BGRA_PREMUL below. This
   // is wrong.
   pp::ImageData image(pp::ImageData::GetNativeImageDataFormat(),
                       pp::Size(viewport_width_, viewport_height_),
                       false);
   if (image.is_null()) {
@@ skipping 25 matching lines @@
     //
     // TODO(ajwong): This is an ugly control flow. fix.
     return;
   }
   device_context_.ReplaceContents(&image);
   device_context_.Flush(TaskToCompletionCallback(
       NewRunnableMethod(this, &PepperView::OnPaintDone)));
 }
 
 void PepperView::SetSolidFill(uint32 color) {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::SetSolidFill, color));
     return;
   }
 
   is_static_fill_ = true;
   static_fill_color_ = color;
 }
 
 void PepperView::UnsetSolidFill() {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::UnsetSolidFill));
     return;
   }
 
   is_static_fill_ = false;
 }
 
 void PepperView::SetViewport(int x, int y, int width, int height) {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(NewRunnableMethod(this, &PepperView::SetViewport,
                                           x, y, width, height));
     return;
   }
 
   // TODO(ajwong): Should we ignore x & y updates?  What do those even mean?
 
   // TODO(ajwong): What does viewport x, y mean to a plugin anyways?
   viewport_x_ = x;
   viewport_y_ = y;
   viewport_width_ = width;
   viewport_height_ = height;
 
   device_context_ =
       pp::DeviceContext2D(pp::Size(viewport_width_, viewport_height_), false);
-  if (!plugin_->BindGraphicsDeviceContext(device_context_)) {
+  if (!instance_->BindGraphicsDeviceContext(device_context_)) {
     LOG(ERROR) << "Couldn't bind the device context.";
     return;
   }
 }
 
 void PepperView::SetHostScreenSize(int width, int height) {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(NewRunnableMethod(this,
                                             &PepperView::SetHostScreenSize,
                                             width, height));
     return;
   }
 
   backing_store_width_ = width;
   backing_store_height_ = height;
 }
 
 void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::HandleBeginUpdateStream,
                           msg));
     return;
   }
 
   scoped_ptr<HostMessage> deleter(msg);
 
   // TODO(hclam): Use the information from the message to create the decoder.
   // We lazily construct the decoder.
   if (!decoder_.get()) {
     decoder_.reset(new DecoderZlib());
   }
 
   if (!frame_) {
     media::VideoFrame::CreateFrame(media::VideoFrame::RGB32,
                                    backing_store_width_,
                                    backing_store_height_,
                                    base::TimeDelta(), base::TimeDelta(),
                                    &frame_);
   }
 
   // Tell the decoder to do start decoding.
   decoder_->BeginDecode(frame_, &update_rects_,
       NewRunnableMethod(this, &PepperView::OnPartialDecodeDone),
       NewRunnableMethod(this, &PepperView::OnDecodeDone));
 }
 
 void PepperView::HandleUpdateStreamPacket(HostMessage* msg) {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::HandleUpdateStreamPacket,
                           msg));
     return;
   }
 
   decoder_->PartialDecode(msg);
 }
 
 void PepperView::HandleEndUpdateStream(HostMessage* msg) {
-  if (!plugin_->CurrentlyOnPluginThread()) {
+  if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::HandleEndUpdateStream,
                           msg));
     return;
   }
 
   scoped_ptr<HostMessage> deleter(msg);
   decoder_->EndDecode();
 }
 
 void PepperView::OnPaintDone() {
   // TODO(ajwong):Probably should set some variable to allow repaints to
   // actually paint.
   return;
 }
 
 void PepperView::OnPartialDecodeDone() {
   all_update_rects_.insert(all_update_rects_.begin() +
                            all_update_rects_.size(),
                            update_rects_.begin(), update_rects_.end());
   Paint();
   // TODO(ajwong): Need to block here to be synchronous.
 }
 
 
 void PepperView::OnDecodeDone() {
 }
 
 }  // namespace remoting