Refactor 3 PPB_Flash functions to the new resource model.

ppapi/proxy/ppb_flash_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_flash_proxy.h"
 
 #include <math.h>
 
 #include <limits>
 
@@ skipping 88 matching lines @@
 bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) {
   if (!dispatcher()->permissions().HasPermission(PERMISSION_FLASH))
     return false;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Flash_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_SetInstanceAlwaysOnTop,
                         OnHostMsgSetInstanceAlwaysOnTop)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_DrawGlyphs,
                         OnHostMsgDrawGlyphs)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetProxyForURL,
-                        OnHostMsgGetProxyForURL)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_Navigate, OnHostMsgNavigate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetLocalTimeZoneOffset,
                         OnHostMsgGetLocalTimeZoneOffset)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_IsRectTopmost,
                         OnHostMsgIsRectTopmost)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_OpenFileRef,
                         OnHostMsgOpenFileRef)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_QueryFileRef,
                         OnHostMsgQueryFileRef)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_InvokePrinting,
@@ skipping 50 matching lines @@
   params.glyph_advances.insert(params.glyph_advances.begin(),
                                &glyph_advances[0],
                                &glyph_advances[glyph_count]);
 
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBFlash_DrawGlyphs(
       API_ID_PPB_FLASH, instance, params, &result));
   return result;
 }
 
-PP_Var PPB_Flash_Proxy::GetProxyForURL(PP_Instance instance, const char* url) {
-  ReceiveSerializedVarReturnValue result;
-  dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetProxyForURL(
-      API_ID_PPB_FLASH, instance, url, &result));
-  return result.Return(dispatcher());
-}
-
 int32_t PPB_Flash_Proxy::Navigate(PP_Instance instance,
                                   PP_Resource request_info,
                                   const char* target,
                                   PP_Bool from_user_action) {
   thunk::EnterResourceNoLock<thunk::PPB_URLRequestInfo_API> enter(
       request_info, true);
   if (enter.failed())
     return PP_ERROR_BADRESOURCE;
   return Navigate(instance, enter.object()->GetData(), target,
                   from_user_action);
@@ skipping 56 matching lines @@
 }
 
 PP_Bool PPB_Flash_Proxy::IsRectTopmost(PP_Instance instance,
                                        const PP_Rect* rect) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBFlash_IsRectTopmost(
       API_ID_PPB_FLASH, instance, *rect, &result));
   return result;
 }
 
-void PPB_Flash_Proxy::UpdateActivity(PP_Instance instance) {
-  PluginGlobals::Get()->GetBrowserSender()->Send(
-      new PpapiHostMsg_PPBFlash_UpdateActivity(API_ID_PPB_FLASH));
-}
-
 PP_Var PPB_Flash_Proxy::GetSetting(PP_Instance instance,
                                    PP_FlashSetting setting) {
   PluginDispatcher* plugin_dispatcher =
       static_cast<PluginDispatcher*>(dispatcher());
   switch (setting) {
     case PP_FLASHSETTING_3DENABLED:
       return PP_MakeBool(PP_FromBool(
           plugin_dispatcher->preferences().is_3d_supported));
     case PP_FLASHSETTING_INCOGNITO:
       return PP_MakeBool(PP_FromBool(plugin_dispatcher->incognito()));
     case PP_FLASHSETTING_STAGE3DENABLED:
       return PP_MakeBool(PP_FromBool(
           plugin_dispatcher->preferences().is_stage3d_supported));
     case PP_FLASHSETTING_LANGUAGE:
       return StringVar::StringToPPVar(
           PluginGlobals::Get()->GetUILanguage());
     case PP_FLASHSETTING_NUMCORES:
       return PP_MakeInt32(plugin_dispatcher->preferences().number_of_cpu_cores);
     case PP_FLASHSETTING_LSORESTRICTIONS: {
       ReceiveSerializedVarReturnValue result;
       dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetSetting(
           API_ID_PPB_FLASH, instance, setting, &result));
       return result.Return(dispatcher());
     }
   }
   return PP_MakeUndefined();
 }
 
-PP_Bool PPB_Flash_Proxy::SetCrashData(PP_Instance instance,
-                                      PP_FlashCrashKey key,
-                                      PP_Var value) {
-  switch (key) {
-    case PP_FLASHCRASHKEY_URL:
-      StringVar *url_string_var(StringVar::FromPPVar(value));
-      if (!url_string_var)
-        return PP_FALSE;
-      std::string url_string(url_string_var->value());
-      PluginGlobals::Get()->SetActiveURL(url_string);
-      return PP_TRUE;
-  }
-  return PP_FALSE;
-}
-
 bool PPB_Flash_Proxy::CreateThreadAdapterForInstance(PP_Instance instance) {
   return true;
 }
 
 void PPB_Flash_Proxy::ClearThreadAdapterForInstance(PP_Instance instance) {
 }
 
 int32_t PPB_Flash_Proxy::OpenFile(PP_Instance,
                                   const char* path,
                                   int32_t mode,
@@ skipping 198 matching lines @@
       const_cast<float(*)[3]>(params.transformation),
       params.allow_subpixel_aa,
       static_cast<uint32_t>(params.glyph_indices.size()),
       const_cast<uint16_t*>(&params.glyph_indices[0]),
       const_cast<PP_Point*>(&params.glyph_advances[0]));
 
   // SetToPPFontDescription() creates a var which is owned by the caller.
   PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(font_desc.face);
 }
 
-void PPB_Flash_Proxy::OnHostMsgGetProxyForURL(PP_Instance instance,
-                                              const std::string& url,
-                                              SerializedVarReturnValue result) {
-  EnterInstanceNoLock enter(instance);
-  if (enter.succeeded()) {
-    result.Return(dispatcher(),
-                  enter.functions()->GetFlashAPI()->GetProxyForURL(
-                      instance, url.c_str()));
-  } else {
-    result.Return(dispatcher(), PP_MakeUndefined());
-  }
-}
-
 void PPB_Flash_Proxy::OnHostMsgNavigate(PP_Instance instance,
                                         const URLRequestInfoData& data,
                                         const std::string& target,
                                         PP_Bool from_user_action,
                                         int32_t* result) {
   EnterInstanceNoLock enter_instance(instance);
   if (enter_instance.failed()) {
     *result = PP_ERROR_BADARGUMENT;
     return;
   }
@@ skipping 91 matching lines @@
   // It's rarely used enough that we just request this interface when needed.
   const PPB_Flash_Print_1_0* print_interface =
       static_cast<const PPB_Flash_Print_1_0*>(
           dispatcher()->local_get_interface()(PPB_FLASH_PRINT_INTERFACE_1_0));
   if (print_interface)
     print_interface->InvokePrinting(instance);
 }
 
 }  // namespace proxy
 }  // namespace ppapi