Refactoring of the client-side input pipeline and scaling dimension management.

remoting/client/plugin/pepper_view.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 "remoting/client/plugin/pepper_view.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
@@ skipping 244 matching lines @@
 
     case protocol::ConnectionToHost::FAILED:
       SetSolidFill(kFailedColor);
       scriptable_obj->SetConnectionStatus(
           ChromotingScriptableObject::STATUS_FAILED,
           ConvertConnectionError(error));
       break;
   }
 }
 
-bool PepperView::SetPluginSize(const SkISize& plugin_size) {
-  if (plugin_size_ == plugin_size)
+bool PepperView::SetViewSize(const SkISize& view_size) {
+  if (view_size_ == view_size)
     return false;
-  plugin_size_ = plugin_size;
+  view_size_ = view_size;
 
-  pp::Size pp_size = pp::Size(plugin_size.width(), plugin_size.height());
+  pp::Size pp_size = pp::Size(view_size.width(), view_size.height());
 
   graphics2d_ = pp::Graphics2D(instance_, pp_size, true);
   if (!instance_->BindGraphics(graphics2d_)) {
     LOG(ERROR) << "Couldn't bind the device context.";
     return false;
   }
 
-  if (plugin_size.isEmpty())
+  if (view_size.isEmpty())
     return false;
 
   // Allocate the backing store to save the desktop image.
   if ((backing_store_.get() == NULL) ||
       (backing_store_->size() != pp_size)) {
     VLOG(1) << "Allocate backing store: "
-            << plugin_size.width() << " x " << plugin_size.height();
+            << view_size.width() << " x " << view_size.height();
     backing_store_.reset(
         new pp::ImageData(instance_, pp::ImageData::GetNativeImageDataFormat(),
                           pp_size, false));
     DCHECK(backing_store_.get() && !backing_store_->is_null())
         << "Not enough memory for backing store.";
   }
   return true;
 }
 
-double PepperView::GetHorizontalScaleRatio() const {
-  if (instance_->DoScaling()) {
-    DCHECK(!host_size_.isEmpty());
-    return 1.0 * plugin_size_.width() / host_size_.width();
-  }
-  return 1.0;
-}
-
-double PepperView::GetVerticalScaleRatio() const {
-  if (instance_->DoScaling()) {
-    DCHECK(!host_size_.isEmpty());
-    return 1.0 * plugin_size_.height() / host_size_.height();
-  }
-  return 1.0;
-}
-
 void PepperView::AllocateFrame(media::VideoFrame::Format format,
                                const SkISize& size,
                                scoped_refptr<media::VideoFrame>* frame_out,
                                const base::Closure& done) {
   DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
 
   *frame_out = media::VideoFrame::CreateFrame(
       media::VideoFrame::RGB32, size.width(), size.height(),
       base::TimeDelta(), base::TimeDelta());
   (*frame_out)->AddRef();
@@ skipping 24 matching lines @@
       (base::Time::Now() - paint_start).InMilliseconds());
 
   // If the last flush failed because there was already another one in progress
   // then we perform the flush now.
   if (flush_blocked_)
     FlushGraphics(base::Time::Now());
   return;
 }
 
 }  // namespace remoting