Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/ppb_pdf_impl.cc

 // Copyright (c) 2010 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 "build/build_config.h"
-
-#include "webkit/glue/plugins/pepper_private.h"
-
-#include "unicode/usearch.h"
+#include "webkit/plugins/ppapi/ppb_pdf_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "skia/ext/platform_canvas.h"
 #include "ppapi/c/pp_resource.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/icu/public/i18n/unicode/usearch.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/plugins/pepper_image_data.h"
-#include "webkit/glue/plugins/pepper_plugin_delegate.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
-#include "webkit/glue/plugins/pepper_plugin_module.h"
-#include "webkit/glue/plugins/pepper_var.h"
-#include "webkit/glue/plugins/ppb_private.h"
-#include "webkit/glue/plugins/pepper_var.h"
+#include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
+#include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/ppb_pdf.h"
+#include "webkit/plugins/ppapi/var.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 #if defined(OS_LINUX)
 class PrivateFontFile : public Resource {
  public:
   PrivateFontFile(PluginModule* module, int fd)
       : Resource(module),
         fd_(fd) {
   }
   virtual ~PrivateFontFile() {
   }
@@ skipping 74 matching lines @@
   }
   if (res_id == 0)
     return 0;
 
   SkBitmap* res_bitmap =
       ResourceBundle::GetSharedInstance().GetBitmapNamed(res_id);
 
   PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
   if (!module)
     return 0;
-  scoped_refptr<pepper::ImageData> image_data(new pepper::ImageData(module));
-  if (!image_data->Init(ImageData::GetNativeImageDataFormat(),
+  scoped_refptr<PPB_ImageData_Impl> image_data(new PPB_ImageData_Impl(module));
+  if (!image_data->Init(PPB_ImageData_Impl::GetNativeImageDataFormat(),
                         res_bitmap->width(), res_bitmap->height(), false)) {
     return 0;
   }
 
   ImageDataAutoMapper mapper(image_data);
   if (!mapper.is_valid())
     return 0;
 
   skia::PlatformCanvas* canvas = image_data->mapped_canvas();
   SkBitmap& ret_bitmap =
@@ skipping 23 matching lines @@
       description->weight >= PP_FONTWEIGHT_BOLD,
       description->italic,
       charset);
   if (fd == -1)
     return 0;
 
   scoped_refptr<PrivateFontFile> font(new PrivateFontFile(module, fd));
 
   return font->GetReference();
 #else
-  // For trusted pepper plugins, this is only needed in Linux since font loading
+  // For trusted PPAPI plugins, this is only needed in Linux since font loading
   // on Windows and Mac works through the renderer sandbox.
   return 0;
 #endif
 }
 
 bool GetFontTableForPrivateFontFile(PP_Resource font_file,
                                     uint32_t table,
                                     void* output,
                                     uint32_t* output_length) {
 #if defined(OS_LINUX)
@@ skipping 81 matching lines @@
 void HistogramPDFPageCount(int count) {
   UMA_HISTOGRAM_COUNTS_10000("PDF.PageCount", count);
 }
 
 void UserMetricsRecordAction(PP_Var action) {
   scoped_refptr<StringVar> action_str(StringVar::FromPPVar(action));
   if (action_str)
     webkit_glue::UserMetricsRecordAction(action_str->value());
 }
 
-const PPB_Private ppb_private = {
+const PPB_PDF ppb_pdf = {
   &GetLocalizedString,
   &GetResourceImage,
   &GetFontFileWithFallback,
   &GetFontTableForPrivateFontFile,
   &SearchString,
   &DidStartLoading,
   &DidStopLoading,
   &SetContentRestriction,
   &HistogramPDFPageCount,
   &UserMetricsRecordAction
 };
 
 }  // namespace
 
 // static
-const PPB_Private* Private::GetInterface() {
-  return &ppb_private;
+const PPB_PDF* PPB_PDF_Impl::GetInterface() {
+  return &ppb_pdf;
 }
 
 #if defined(OS_LINUX)
 bool PrivateFontFile::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);
   *output_length = static_cast<uint32_t>(temp_size);
   return rv;
 }
 #endif
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
+