| Index: webkit/plugins/ppapi/ppb_flash_impl_linux.cc
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_flash_impl_linux.cc (revision 0)
|
| +++ webkit/plugins/ppapi/ppb_flash_impl_linux.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // 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"
|
| @@ -14,22 +14,24 @@
|
| #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);
|
| @@ -106,5 +108,7 @@
|
| return true;
|
| }
|
|
|
| -} // namespace pepper
|
| +} // namespace ppapi
|
| +} // namespace plugins
|
| +} // namespace webkit
|
|
|
|
|