Revert 172806

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"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_flash_api.h"
 #include "ppapi/thunk/ppb_flash_functions_api.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/ppb_video_capture_api.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
 void SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) {
-  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
+  EnterInstance enter(instance);
   if (enter.failed())
     return;
-  enter.functions()->SetInstanceAlwaysOnTop(instance, on_top);
+  enter.functions()->GetFlashAPI()->SetInstanceAlwaysOnTop(instance, on_top);
 }
 
 PP_Bool DrawGlyphs(PP_Instance instance,
                    PP_Resource pp_image_data,
                    const PP_BrowserFont_Trusted_Description* font_desc,
                    uint32_t color,
                    const PP_Point* position,
                    const PP_Rect* clip,
                    const float transformation[3][3],
                    PP_Bool allow_subpixel_aa,
                    uint32_t glyph_count,
                    const uint16_t glyph_indices[],
                    const PP_Point glyph_advances[]) {
-  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
+  EnterInstance enter(instance);
   if (enter.failed())
     return PP_FALSE;
-  return enter.functions()->DrawGlyphs(
+  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) {
   EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
   if (enter.failed())
     return PP_MakeUndefined();
   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);
     if (enter.failed())
       return PP_ERROR_BADRESOURCE;
     instance = enter.resource()->pp_instance();
   }
 
-  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
+  EnterInstance enter(instance);
   if (enter.failed())
     return PP_ERROR_BADARGUMENT;
-  return enter.functions()->Navigate(instance, request_id, target,
-                                     from_user_action);
+  return enter.functions()->GetFlashAPI()->Navigate(instance, request_id,
+                                                    target, from_user_action);
 }
 
 void RunMessageLoop(PP_Instance instance) {
   // Deprecated.
   NOTREACHED();
   return;
 }
 
 void QuitMessageLoop(PP_Instance instance) {
   // Deprecated.
@@ skipping 15 matching lines @@
 }
 
 void PreLoadFontWin(const void* logfontw) {
   // There's no instance so we have to reach into the delegate without
   // thunking.
   ProxyAutoLock lock;
   PpapiGlobals::Get()->PreCacheFontForFlash(logfontw);
 }
 
 PP_Bool IsRectTopmost(PP_Instance instance, const PP_Rect* rect) {
-  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
+  EnterInstance enter(instance);
   if (enter.failed())
     return PP_FALSE;
-  return enter.functions()->IsRectTopmost(instance, rect);
+  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) {
   EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
   if (enter.failed())
@@ skipping 123 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