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

webkit/plugins/ppapi/ppb_flash_impl_linux.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 "webkit/glue/plugins/pepper_private2.h"
+#include "webkit/plugins/ppapi/ppb_flash_impl.h"
 
 #include "skia/ext/platform_canvas.h"
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkTemplates.h"
 #include "third_party/skia/include/core/SkTypeface.h"
-#include "webkit/glue/plugins/pepper_image_data.h"
-#include "webkit/glue/plugins/pepper_var.h"
+#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/var.h"
 
-namespace pepper {
+namespace webkit {
+namespace plugins {
+namespace ppapi {
 
-bool Private2::DrawGlyphs(PP_Resource pp_image_data,
-                          const PP_FontDescription_Dev* font_desc,
-                          uint32_t color,
-                          PP_Point position,
-                          PP_Rect clip,
-                          const float transformation[3][3],
-                          uint32_t glyph_count,
-                          const uint16_t glyph_indices[],
-                          const PP_Point glyph_advances[]) {
-  scoped_refptr<ImageData> image_resource(
-      Resource::GetAs<ImageData>(pp_image_data));
+bool PPB_Flash_Impl::DrawGlyphs(PP_Resource pp_image_data,
+                                const PP_FontDescription_Dev* font_desc,
+                                uint32_t color,
+                                PP_Point position,
+                                PP_Rect clip,
+                                const float transformation[3][3],
+                                uint32_t glyph_count,
+                                const uint16_t glyph_indices[],
+                                const PP_Point glyph_advances[]) {
+  scoped_refptr<PPB_ImageData_Impl> image_resource(
+      Resource::GetAs<PPB_ImageData_Impl>(pp_image_data));
   if (!image_resource.get())
     return false;
   ImageDataAutoMapper mapper(image_resource);
   if (!mapper.is_valid())
     return false;
 
   // Set up the typeface.
   scoped_refptr<StringVar> face_name(StringVar::FromPPVar(font_desc->face));
   if (!face_name)
     return false;
@@ skipping 56 matching lines @@
     x += SkFloatToScalar(glyph_advances[i].x);
     y += SkFloatToScalar(glyph_advances[i].y);
   }
 
   canvas->drawPosText(glyph_indices, glyph_count * 2, sk_positions, paint);
 
   canvas->restore();
   return true;
 }
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace plugins
+}  // namespace webkit