Remove webkit::ppapi::Resource.

chrome/renderer/chrome_ppb_pdf_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 "chrome/renderer/chrome_ppb_pdf_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/shared_impl/var.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "unicode/usearch.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/ppapi/plugin_delegate.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_tracker.h"
 
 namespace chrome {
 
 #if defined(OS_LINUX)
-class PrivateFontFile : public webkit::ppapi::Resource {
+class PrivateFontFile : public ppapi::Resource {
  public:
-  PrivateFontFile(webkit::ppapi::PluginInstance* instance, int fd)
-      : webkit::ppapi::Resource(instance),
-        fd_(fd) {
+  PrivateFontFile(PP_Instance instance, int fd) : Resource(instance), fd_(fd) {
   }
   virtual ~PrivateFontFile() {
   }
 
   bool GetFontTable(uint32_t table,
                     void* output,
                     uint32_t* output_length) {
     size_t temp_size = static_cast<size_t>(*output_length);
     bool rv = webkit_glue::GetFontTable(
         fd_, table, static_cast<uint8_t*>(output), &temp_size);
@@ skipping 78 matching lines @@
     rv = UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PAGE_LOAD_FAILED));
   } else if (string_id == PP_RESOURCESTRING_PDFPROGRESSLOADING) {
     rv = UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PROGRESS_LOADING));
   } else {
     NOTREACHED();
   }
 
   return ppapi::StringVar::StringToPPVar(instance->module()->pp_module(), rv);
 }
 
-PP_Resource GetResourceImage(PP_Instance instance_id,
+PP_Resource GetResourceImage(PP_Instance instance,
                              PP_ResourceImage image_id) {
   int res_id = 0;
   for (size_t i = 0; i < arraysize(kResourceImageMap); ++i) {
     if (kResourceImageMap[i].pp_id == image_id) {
       res_id = kResourceImageMap[i].res_id;
       break;
     }
   }
   if (res_id == 0)
     return 0;
 
   SkBitmap* res_bitmap =
       ResourceBundle::GetSharedInstance().GetBitmapNamed(res_id);
 
-  webkit::ppapi::PluginInstance* instance =
-      webkit::ppapi::ResourceTracker::Get()->GetInstance(instance_id);
-  if (!instance)
+  // Validate the instance.
+  if (!webkit::ppapi::ResourceTracker::Get()->GetInstance(instance))

[viettrungluu, 2011/08/22 23:19:46]

I really wish we had a consistent convention for instance_id/instance (and
distinguishing PluginInstances and PP_Instances). You're making this file even
less consistent. :(

[brettw, 2011/08/23 17:16:28]

This patch generally removes uses of PluginInstance. In the code, I just use
"instance" to refer to the PP_Instance, since there is nothing else, which is
why I did the same here. Since this class (unusually) also uses PluginInstance a
lot, I've put this back to instance_id.

     return 0;
   scoped_refptr<webkit::ppapi::PPB_ImageData_Impl> image_data(
       new webkit::ppapi::PPB_ImageData_Impl(instance));
   if (!image_data->Init(
           webkit::ppapi::PPB_ImageData_Impl::GetNativeImageDataFormat(),
           res_bitmap->width(), res_bitmap->height(), false)) {
     return 0;
   }
 
   webkit::ppapi::ImageDataAutoMapper mapper(image_data);
   if (!mapper.is_valid())
     return 0;
 
   skia::PlatformCanvas* canvas = image_data->mapped_canvas();
   // Note: Do not skBitmap::copyTo the canvas bitmap directly because it will
   // ignore the allocated pixels in shared memory and re-allocate a new buffer.
   skia::GetTopDevice(*canvas)->writePixels(*res_bitmap, 0, 0);
 
   return image_data->GetReference();
 }
 
 PP_Resource GetFontFileWithFallback(
-    PP_Instance instance_id,
+    PP_Instance instance,
     const PP_FontDescription_Dev* description,
     PP_PrivateFontCharset charset) {
 #if defined(OS_LINUX)
-  webkit::ppapi::PluginInstance* instance =
-      webkit::ppapi::ResourceTracker::Get()->GetInstance(instance_id);
-  if (!instance)
+  // Validate the instance before using it below.
+  if (!webkit::ppapi::ResourceTracker::Get()->GetInstance(instance))
     return 0;
 
   scoped_refptr<ppapi::StringVar> face_name(ppapi::StringVar::FromPPVar(
       description->face));
   if (!face_name)
     return 0;
 
   int fd = webkit_glue::MatchFontWithFallback(
       face_name->value().c_str(),
       description->weight >= PP_FONTWEIGHT_BOLD,
@@ skipping 152 matching lines @@
   &SaveAs
 };
 
 // static
 const PPB_PDF* PPB_PDF_Impl::GetInterface() {
   return &ppb_pdf;
 }
 
 }  // namespace chrome