Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_font_impl.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 "webkit/plugins/ppapi/ppb_font_impl.h"
 
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/shared_impl/font_impl.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/ppapi/string.h"
 
 using ppapi::StringVar;
 using ppapi::thunk::EnterResource;
 using ppapi::thunk::PPB_ImageData_API;
 using ppapi::WebKitForwarding;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Converts the given PP_TextRun to a TextRun, returning true on success.
 // False means the input was invalid.
 bool PPTextRunToTextRun(const PP_TextRun_Dev* run,
                         WebKitForwarding::Font::TextRun* output) {
   StringVar* text_string = StringVar::FromPPVar(run->text);
   if (!text_string)
     return false;
 
   output->text = text_string->value();
   output->rtl = PPBoolToBool(run->rtl);
   output->override_direction = PPBoolToBool(run->override_direction);
   return true;
 }
 
 }  // namespace
 
-PPB_Font_Impl::PPB_Font_Impl(PluginInstance* instance,
+PPB_Font_Impl::PPB_Font_Impl(PP_Instance pp_instance,
                              const PP_FontDescription_Dev& desc)
-    : Resource(instance) {
+    : Resource(pp_instance) {
   StringVar* face_name = StringVar::FromPPVar(desc.face);
 
+  PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
   WebKitForwarding::Font* result = NULL;
   instance->module()->GetWebKitForwarding()->CreateFontForwarding(
       NULL, desc, face_name ? face_name->value() : std::string(),
       instance->delegate()->GetPreferences(), &result);
   font_forwarding_.reset(result);
 }
 
 PPB_Font_Impl::~PPB_Font_Impl() {
 }
 
 // static
-PP_Resource PPB_Font_Impl::Create(PluginInstance* instance,
+PP_Resource PPB_Font_Impl::Create(PP_Instance instance,
                                   const PP_FontDescription_Dev& description) {
   if (!::ppapi::FontImpl::IsPPFontDescriptionValid(description))
     return 0;
   return (new PPB_Font_Impl(instance, description))->GetReference();
 }
 
 ::ppapi::thunk::PPB_Font_API* PPB_Font_Impl::AsPPB_Font_API() {
   return this;
 }
 
 PP_Bool PPB_Font_Impl::Describe(PP_FontDescription_Dev* description,
                                 PP_FontMetrics_Dev* metrics) {
   std::string face;
   PP_Bool result = PP_FALSE;
   font_forwarding_->Describe(NULL, description, &face, metrics, &result);
   if (!result)
     return PP_FALSE;
 
   // Convert the string.
   description->face = StringVar::StringToPPVar(
-      instance()->module()->pp_module(), face);
+      ResourceHelper::GetPluginModule(this)->pp_module(), face);
   return PP_TRUE;
 }
 
 PP_Bool PPB_Font_Impl::DrawTextAt(PP_Resource image_data,
                                   const PP_TextRun_Dev* text,
                                   const PP_Point* position,
                                   uint32_t color,
                                   const PP_Rect* clip,
                                   PP_Bool image_data_is_opaque) {
   // Get and map the image data we're painting to.
@@ skipping 58 matching lines @@
   return this;
 }
 
 PP_Var PPB_Font_FunctionImpl::GetFontFamilies(PP_Instance instance) {
   return PP_MakeUndefined();
 }
 
 }  // namespace ppapi
 }  // namespace webkit