diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:31:44 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:31:44 +0000 |
| commit | d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3 (patch) | |
| tree | 8249e5b0757af4c6ad5077941771591771f45a84 /webkit | |
| parent | 635b82774a9961b7e404674d2d08615397e7861f (diff) | |
| download | chromium_src-d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3.zip chromium_src-d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3.tar.gz chromium_src-d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3.tar.bz2 | |
Use PP_BrowserFont_Trusted_Description
instead of PP_FontDescription_Dev for the FLash interface
This changes the old interface without revving the version. This is because the new struct is exactly the same as the old one with a different name, so it will not break binary compat.
BUG=
Review URL: https://codereview.chromium.org/11475006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.cc | 27 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.h | 23 |
2 files changed, 26 insertions, 24 deletions
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc index 237caf3..075292e 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_impl.cc @@ -10,8 +10,8 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/private/ppb_flash.h" +#include "ppapi/c/trusted/ppb_browser_font_trusted.h" #include "ppapi/shared_impl/file_path.h" #include "ppapi/shared_impl/file_type_conversion.h" #include "ppapi/shared_impl/time_conversion.h" @@ -64,17 +64,18 @@ void PPB_Flash_Impl::SetInstanceAlwaysOnTop(PP_Instance instance, instance_->set_always_on_top(PP_ToBool(on_top)); } -PP_Bool PPB_Flash_Impl::DrawGlyphs(PP_Instance instance, - PP_Resource pp_image_data, - const PP_FontDescription_Dev* font_desc, - uint32_t color, - const PP_Point* position, - const PP_Rect* clip, - const float transformation[3][3], - PP_Bool allow_subpixel_aa, - uint32_t glyph_count, - const uint16_t glyph_indices[], - const PP_Point glyph_advances[]) { +PP_Bool PPB_Flash_Impl::DrawGlyphs( + PP_Instance instance, + PP_Resource pp_image_data, + const PP_BrowserFont_Trusted_Description* font_desc, + uint32_t color, + const PP_Point* position, + const PP_Rect* clip, + const float transformation[3][3], + PP_Bool allow_subpixel_aa, + uint32_t glyph_count, + const uint16_t glyph_indices[], + const PP_Point glyph_advances[]) { EnterResourceNoLock<PPB_ImageData_API> enter(pp_image_data, true); if (enter.failed()) return PP_FALSE; @@ -90,7 +91,7 @@ PP_Bool PPB_Flash_Impl::DrawGlyphs(PP_Instance instance, if (!face_name) return PP_FALSE; int style = SkTypeface::kNormal; - if (font_desc->weight >= PP_FONTWEIGHT_BOLD) + if (font_desc->weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD) style |= SkTypeface::kBold; if (font_desc->italic) style |= SkTypeface::kItalic; diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h index f13130c..7b264b0 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.h +++ b/webkit/plugins/ppapi/ppb_flash_impl.h @@ -24,17 +24,18 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared { // PPB_Flash_API. virtual void SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) OVERRIDE; - virtual PP_Bool DrawGlyphs(PP_Instance instance, - PP_Resource pp_image_data, - const PP_FontDescription_Dev* font_desc, - uint32_t color, - const PP_Point* position, - const PP_Rect* clip, - const float transformation[3][3], - PP_Bool allow_subpixel_aa, - uint32_t glyph_count, - const uint16_t glyph_indices[], - const PP_Point glyph_advances[]) OVERRIDE; + virtual PP_Bool DrawGlyphs( + PP_Instance instance, + PP_Resource pp_image_data, + const PP_BrowserFont_Trusted_Description* font_desc, + uint32_t color, + const PP_Point* position, + const PP_Rect* clip, + const float transformation[3][3], + PP_Bool allow_subpixel_aa, + uint32_t glyph_count, + const uint16_t glyph_indices[], + const PP_Point glyph_advances[]) OVERRIDE; virtual int32_t Navigate(PP_Instance instance, PP_Resource request_info, const char* target, |