summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_flash_proxy.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 22:31:44 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 22:31:44 +0000
commitd0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3 (patch)
tree8249e5b0757af4c6ad5077941771591771f45a84 /ppapi/proxy/ppb_flash_proxy.h
parent635b82774a9961b7e404674d2d08615397e7861f (diff)
downloadchromium_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 'ppapi/proxy/ppb_flash_proxy.h')
-rw-r--r--ppapi/proxy/ppb_flash_proxy.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
index 6043d2c..d9bea31 100644
--- a/ppapi/proxy/ppb_flash_proxy.h
+++ b/ppapi/proxy/ppb_flash_proxy.h
@@ -53,17 +53,18 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
// PPB_Flash_API implementation.
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,