diff options
| -rw-r--r-- | content/browser/renderer_host/pepper_message_filter.cc | 10 | ||||
| -rw-r--r-- | content/browser/renderer_host/pepper_message_filter.h | 1 | ||||
| -rw-r--r-- | ppapi/proxy/ppapi_messages.h | 2 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_flash_proxy.cc | 6 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.cc | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc index 28e0452..c43fbc1 100644 --- a/content/browser/renderer_host/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper_message_filter.cc @@ -90,6 +90,8 @@ void PepperMessageFilter::OverrideThreadForMessage( message.type() == PpapiHostMsg_PPBTCPServerSocket_Listen::ID || message.type() == PpapiHostMsg_PPBHostResolver_Resolve::ID) { *thread = BrowserThread::UI; + } else if (message.type() == PpapiHostMsg_PPBFlash_GetDeviceID::ID) { + *thread = BrowserThread::FILE; } } @@ -141,6 +143,9 @@ bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg, IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBX509Certificate_ParseDER, OnX509CertificateParseDER); + // Flash messages. + IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetDeviceID, OnGetDeviceID) + IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() return handled; @@ -607,6 +612,11 @@ void PepperMessageFilter::OnX509CertificateParseDER( result); } +void PepperMessageFilter::OnGetDeviceID(std::string* id) { + // TODO(brettw) implement this. + *id = "<undefined>"; +} + void PepperMessageFilter::GetFontFamiliesComplete( IPC::Message* reply_msg, scoped_ptr<base::ListValue> result) { diff --git a/content/browser/renderer_host/pepper_message_filter.h b/content/browser/renderer_host/pepper_message_filter.h index d10f6d0e..ed20ee7 100644 --- a/content/browser/renderer_host/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper_message_filter.h @@ -210,6 +210,7 @@ class PepperMessageFilter void OnX509CertificateParseDER(const std::vector<char>& der, bool* succeeded, ppapi::PPB_X509Certificate_Fields* result); + void OnGetDeviceID(std::string* id); // Callback when the font list has been retrieved on a background thread. void GetFontFamiliesComplete(IPC::Message* reply_msg, diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index f83078e..43c1331 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -1175,6 +1175,8 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_IsRectTopmost, PP_Instance /* instance */, PP_Rect /* rect */, PP_Bool /* result */) +IPC_SYNC_MESSAGE_ROUTED0_1(PpapiHostMsg_PPBFlash_GetDeviceID, + std::string /* id */) // PPB_Flash_Clipboard. IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBFlashClipboard_IsFormatAvailable, diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc index 18d1f5a..fc394f3 100644 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ b/ppapi/proxy/ppb_flash_proxy.cc @@ -223,8 +223,10 @@ void UpdateActivity(PP_Instance instance) { } PP_Var GetDeviceID(PP_Instance instance) { - // TODO(brettw) implement me. - return PP_MakeUndefined(); + std::string id; + PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser( + new PpapiHostMsg_PPBFlash_GetDeviceID(API_ID_PPB_FLASH, &id)); + return StringVar::StringToPPVar(id); } const PPB_Flash_11 flash_interface_11 = { diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc index 572a33a..b90e52c 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_impl.cc @@ -267,7 +267,7 @@ void UpdateActivity(PP_Instance pp_instance) { } PP_Var GetDeviceID(PP_Instance pp_instance) { - // TODO(brettw) implement me. + // Not supported in-process. return PP_MakeUndefined(); } |