Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_widget_impl.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "webkit/plugins/ppapi/ppb_widget_impl.h"
 
 #include "ppapi/c/dev/ppp_widget_dev.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_input_event_api.h"
 #include "ppapi/thunk/ppb_widget_api.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;
 using ppapi::thunk::PPB_InputEvent_API;
 using ppapi::thunk::PPB_Widget_API;
 
 namespace webkit {
 namespace ppapi {
 
-PPB_Widget_Impl::PPB_Widget_Impl(PluginInstance* instance)
+PPB_Widget_Impl::PPB_Widget_Impl(PP_Instance instance)
     : Resource(instance) {
   memset(&location_, 0, sizeof(location_));
 }
 
 PPB_Widget_Impl::~PPB_Widget_Impl() {
 }
 
 PPB_Widget_API* PPB_Widget_Impl::AsPPB_Widget_API() {
   return this;
 }
@@ skipping 18 matching lines @@
   *location = location_;
   return PP_TRUE;
 }
 
 void PPB_Widget_Impl::SetLocation(const PP_Rect* location) {
   location_ = *location;
   SetLocationInternal(location);
 }
 
 void PPB_Widget_Impl::Invalidate(const PP_Rect* dirty) {
-  if (!instance())
+  PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
+  if (!plugin_instance)
     return;
   const PPP_Widget_Dev* widget = static_cast<const PPP_Widget_Dev*>(
-      instance()->module()->GetPluginInterface(PPP_WIDGET_DEV_INTERFACE));
+      plugin_instance->module()->GetPluginInterface(PPP_WIDGET_DEV_INTERFACE));
   if (!widget)
     return;
-  ScopedResourceId resource(this);
-  widget->Invalidate(instance()->pp_instance(), resource.id, dirty);
+  widget->Invalidate(pp_instance(), pp_resource(), dirty);
 }
 
 }  // namespace ppapi
 }  // namespace webkit