A few more cleanups to the pepper code. Dispatch IPCs in the sockets implementations directly by ha…

content/renderer/pepper/ppb_scrollbar_impl.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/ppb_scrollbar_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/event_conversion.h"
+#include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/ppb_image_data_impl.h"
-#include "content/renderer/pepper/resource_helper.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/thunk/thunk.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebPluginScrollbar.h"
 
 #if defined(OS_WIN)
@@ skipping 20 matching lines @@
 PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PP_Instance instance)
     : PPB_Widget_Impl(instance),
       weak_ptr_factory_(this) {
 }
 
 PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() {
 }
 
 void PPB_Scrollbar_Impl::Init(bool vertical) {
   PepperPluginInstanceImpl* plugin_instance =
-      ResourceHelper::GetPluginInstance(this);
+      HostGlobals::Get()->GetInstance(pp_instance());
   if (!plugin_instance)
     return;
   scrollbar_.reset(WebPluginScrollbar::createForPlugin(
       vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal,
-      ResourceHelper::GetPluginInstance(this)->container(),
+      plugin_instance->container(),
       static_cast<WebKit::WebPluginScrollbarClient*>(this)));
 }
 
 PPB_Scrollbar_API* PPB_Scrollbar_Impl::AsPPB_Scrollbar_API() {
   return this;
 }
 
 void PPB_Scrollbar_Impl::InstanceWasDeleted() {
   scrollbar_.reset();
 }
@@ skipping 90 matching lines @@
 void PPB_Scrollbar_Impl::SetLocationInternal(const PP_Rect* location) {
   if (!scrollbar_)
     return;
   scrollbar_->setLocation(WebRect(location->point.x,
                                   location->point.y,
                                   location->size.width,
                                   location->size.height));
 }
 
 void PPB_Scrollbar_Impl::valueChanged(WebKit::WebPluginScrollbar* scrollbar) {
-  PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->GetInstance(pp_instance())->module();
   if (!plugin_module)
     return;
 
   const PPP_Scrollbar_Dev* ppp_scrollbar =
       static_cast<const PPP_Scrollbar_Dev*>(plugin_module->GetPluginInterface(
           PPP_SCROLLBAR_DEV_INTERFACE));
   if (!ppp_scrollbar) {
     // Try the old version. This is ok because the old interface is a subset of
     // the new one, and ValueChanged didn't change.
     ppp_scrollbar =
         static_cast<const PPP_Scrollbar_Dev*>(plugin_module->GetPluginInterface(
             PPP_SCROLLBAR_DEV_INTERFACE_0_2));
     if (!ppp_scrollbar)
       return;
   }
   ppp_scrollbar->ValueChanged(pp_instance(), pp_resource(),
                               scrollbar_->value());
 }
 
 void PPB_Scrollbar_Impl::overlayChanged(WebPluginScrollbar* scrollbar) {
-  PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->GetInstance(pp_instance())->module();
   if (!plugin_module)
     return;
 
   const PPP_Scrollbar_Dev* ppp_scrollbar =
       static_cast<const PPP_Scrollbar_Dev*>(plugin_module->GetPluginInterface(
           PPP_SCROLLBAR_DEV_INTERFACE));
   if (!ppp_scrollbar)
     return;
   ppp_scrollbar->OverlayChanged(pp_instance(), pp_resource(),
                                 PP_FromBool(IsOverlay()));
@@ skipping 36 matching lines @@
   PP_Rect pp_rect;
   pp_rect.point.x = dirty_.x();
   pp_rect.point.y = dirty_.y();
   pp_rect.size.width = dirty_.width();
   pp_rect.size.height = dirty_.height();
   dirty_ = gfx::Rect();
   Invalidate(&pp_rect);
 }
 
 }  // namespace content