| Index: ppapi/c/private/ppb_flash_font_file.h
|
| diff --git a/ppapi/c/private/ppb_flash_font_file.h b/ppapi/c/private/ppb_flash_font_file.h
|
| index f50818ed4d968a69fb5fcc87396b5f43f2fb6b14..fd1845678fb1503d4685ba4b3dc12072b86b176c 100644
|
| --- a/ppapi/c/private/ppb_flash_font_file.h
|
| +++ b/ppapi/c/private/ppb_flash_font_file.h
|
| @@ -18,7 +18,8 @@
|
| #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
|
|
|
| #define PPB_FLASH_FONTFILE_INTERFACE_0_1 "PPB_Flash_FontFile;0.1"
|
| -#define PPB_FLASH_FONTFILE_INTERFACE PPB_FLASH_FONTFILE_INTERFACE_0_1
|
| +#define PPB_FLASH_FONTFILE_INTERFACE_0_2 "PPB_Flash_FontFile;0.2"
|
| +#define PPB_FLASH_FONTFILE_INTERFACE PPB_FLASH_FONTFILE_INTERFACE_0_2
|
|
|
| /**
|
| * @file
|
| @@ -53,8 +54,47 @@ struct PPB_Flash_FontFile_0_1 {
|
| void* output,
|
| uint32_t* output_length);
|
| };
|
| +/**
|
| + * @}
|
| + */
|
| +
|
| +/**
|
| + * @addtogroup Interfaces
|
| + * @{
|
| + */
|
| +/**
|
| + * This new version adds support for Windows.
|
| + *
|
| + * The interface is actually identical to previous version, Flash relies on
|
| + * this new version interface to decide whether it should continue to use Win
|
| + * GDI Font API or switch to this API on Windows.
|
| + *
|
| + */
|
| +struct PPB_Flash_FontFile_0_2 {
|
| + /* Returns a resource identifying a font file corresponding to the given font
|
| + * request after applying the browser-specific fallback.
|
| + */
|
| + PP_Resource (*Create)(
|
| + PP_Instance instance,
|
| + const struct PP_BrowserFont_Trusted_Description* description,
|
| + PP_PrivateFontCharset charset);
|
| + /* Determines if a given resource is Flash font file.
|
| + */
|
| + PP_Bool (*IsFlashFontFile)(PP_Resource resource);
|
| + /* Returns the requested font table.
|
| + * |output_length| should pass in the size of |output|. And it will return
|
| + * the actual length of returned data. |output| could be NULL in order to
|
| + * query the size of the buffer size needed. In that case, the input value of
|
| + * |output_length| is ignored.
|
| + * Note: it is Linux only and fails directly on other platforms.
|
| + */
|
| + PP_Bool (*GetFontTable)(PP_Resource font_file,
|
| + uint32_t table,
|
| + void* output,
|
| + uint32_t* output_length);
|
| +};
|
|
|
| -typedef struct PPB_Flash_FontFile_0_1 PPB_Flash_FontFile;
|
| +typedef struct PPB_Flash_FontFile_0_2 PPB_Flash_FontFile;
|
| /**
|
| * @}
|
| */
|
|
|