Refactor 3 PPB_Flash functions to the new resource model.

ppapi/thunk/ppb_flash_thunk.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 "base/logging.h"
 #include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
@@ skipping 30 matching lines @@
                    const PP_Point glyph_advances[]) {
   EnterInstance enter(instance);
   if (enter.failed())
     return PP_FALSE;
   return enter.functions()->GetFlashAPI()->DrawGlyphs(
       instance, pp_image_data, font_desc, color, position, clip, transformation,
       allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances);
 }
 
 PP_Var GetProxyForURL(PP_Instance instance, const char* url) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);

[victorhsieh, 2012/11/28 07:09:50]

Where is EnterInstanceAPI defined?

[raymes, 2012/11/29 00:08:08]

In enter.h. This is based on another change which is still in the commit queue
so it doesn't show up in the checked in code yet.

   if (enter.failed())
     return PP_MakeUndefined();
-  return enter.functions()->GetFlashAPI()->GetProxyForURL(instance, url);
+  return enter.functions()->GetProxyForURL(instance, url);
 }
 
 int32_t Navigate(PP_Resource request_id,
                  const char* target,
                  PP_Bool from_user_action) {
   // TODO(brettw): this function should take an instance.
   // To work around this, use the PP_Instance from the resource.
   PP_Instance instance;
   {
     thunk::EnterResource<thunk::PPB_URLRequestInfo_API> enter(request_id, true);
@@ skipping 47 matching lines @@
     return PP_FALSE;
   return enter.functions()->GetFlashAPI()->IsRectTopmost(instance, rect);
 }
 
 int32_t InvokePrinting(PP_Instance instance) {
   // This function is no longer supported, use PPB_Flash_Print instead.
   return PP_ERROR_NOTSUPPORTED;
 }
 
 void UpdateActivity(PP_Instance instance) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
   if (enter.failed())
     return;
-  enter.functions()->GetFlashAPI()->UpdateActivity(instance);
+  enter.functions()->UpdateActivity(instance);
 }
 
 PP_Var GetDeviceID(PP_Instance instance) {
   // Deprecated.
   NOTREACHED();
   return PP_MakeUndefined();
 }
 
 int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
   // Deprecated.
   NOTREACHED();
   return -1;
 }
 
 PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) {
   EnterInstance enter(instance);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.functions()->GetFlashAPI()->GetSetting(instance, setting);
 }
 
 PP_Bool SetCrashData(PP_Instance instance,
                      PP_FlashCrashKey key,
                      PP_Var value) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
   if (enter.failed())
     return PP_FALSE;
-  return enter.functions()->GetFlashAPI()->SetCrashData(instance, key, value);
+  return enter.functions()->SetCrashData(instance, key, value);
 }
 
 int32_t EnumerateVideoCaptureDevices(PP_Instance instance,
                                      PP_Resource video_capture,
                                      PP_ArrayOutput devices) {
   thunk::EnterResource<thunk::PPB_VideoCapture_API> enter(video_capture, true);
   if (enter.failed())
     return enter.retval();
   return enter.object()->EnumerateDevicesSync(devices);
 }
@@ skipping 83 matching lines @@
 const PPB_Flash_12_6* GetPPB_Flash_12_6_Thunk() {
   return &g_ppb_flash_12_6_thunk;
 }
 
 const PPB_Flash_13_0* GetPPB_Flash_13_0_Thunk() {
   return &g_ppb_flash_13_0_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi