diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 21:17:00 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 21:17:00 +0000 |
| commit | a6d81c01451303b112e1cb7c8f2598356f348539 (patch) | |
| tree | aef52b9b75522ea0ccab00925d1ca288bb1a6166 /webkit/plugins | |
| parent | 6810670b2e104cc67aefc9c53a41866aba4629b7 (diff) | |
| download | chromium_src-a6d81c01451303b112e1cb7c8f2598356f348539.zip chromium_src-a6d81c01451303b112e1cb7c8f2598356f348539.tar.gz chromium_src-a6d81c01451303b112e1cb7c8f2598356f348539.tar.bz2 | |
Convert pepper font list to new resource system.
This converts the GetFontFamilies call to the new resource system using a singleton resource.
BUG=
Review URL: https://codereview.chromium.org/11578038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 6 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 83145f1..053b603 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -2023,11 +2023,6 @@ PP_Var PluginInstance::GetDefaultCharSet(PP_Instance instance) { return StringVar::StringToPPVar(encoding); } -PP_Var PluginInstance::GetFontFamilies(PP_Instance instance) { - // No in-process implementation. - return PP_MakeUndefined(); -} - // These PPB_ContentDecryptor_Private calls are responses to // PPP_ContentDecryptor_Private calls made on |content_decryptor_delegate_|. // Therefore, |content_decryptor_delegate_| must have been initialized when @@ -2150,6 +2145,7 @@ PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) { // Flash APIs and some others aren't implemented in-process. switch (id) { case ::ppapi::BROKER_SINGLETON_ID: + case ::ppapi::BROWSER_FONT_SINGLETON_ID: case ::ppapi::FLASH_CLIPBOARD_SINGLETON_ID: case ::ppapi::FLASH_FILE_SINGLETON_ID: case ::ppapi::FLASH_FULLSCREEN_SINGLETON_ID: diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index ff7a0e5..f58850e 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -363,7 +363,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : virtual uint32_t GetAudioHardwareOutputBufferSize(PP_Instance instance) OVERRIDE; virtual PP_Var GetDefaultCharSet(PP_Instance instance) OVERRIDE; - virtual PP_Var GetFontFamilies(PP_Instance instance) OVERRIDE; virtual void NumberOfFindResultsChanged(PP_Instance instance, int32_t total, PP_Bool final_result) OVERRIDE; |