Index: ppapi/thunk/ppb_flash_fullscreen_thunk.cc |
diff --git a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc |
index 598dc715da59739b3d5a90be85f4bf5d9533068a..f64ad992fda4644a70dbb337bc66a0ec0215d039 100644 |
--- a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc |
+++ b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc |
@@ -6,8 +6,8 @@ |
#include "ppapi/c/private/ppb_flash_fullscreen.h" |
#include "ppapi/thunk/thunk.h" |
#include "ppapi/thunk/enter.h" |
+#include "ppapi/thunk/ppb_flash_fullscreen_api.h" |
#include "ppapi/thunk/ppb_instance_api.h" |
-#include "ppapi/thunk/ppb_flash_api.h" |
#include "ppapi/thunk/resource_creation_api.h" |
namespace ppapi { |
@@ -16,25 +16,26 @@ namespace thunk { |
namespace { |
PP_Bool IsFullscreen(PP_Instance instance) { |
- EnterInstance enter(instance); |
+ EnterInstanceAPI<PPB_Flash_Fullscreen_API> enter(instance); |
if (enter.failed()) |
return PP_FALSE; |
- return enter.functions()->GetFlashAPI()->FlashIsFullscreen(instance); |
+ return enter.functions()->IsFullscreen(instance); |
} |
PP_Bool SetFullscreen(PP_Instance instance, PP_Bool fullscreen) { |
- EnterInstance enter(instance); |
+ EnterInstanceAPI<PPB_Flash_Fullscreen_API> enter(instance); |
if (enter.failed()) |
return PP_FALSE; |
- return enter.functions()->GetFlashAPI()->FlashSetFullscreen(instance, |
- fullscreen); |
+ return enter.functions()->SetFullscreen(instance, fullscreen); |
} |
+// TODO(raymes): The codepaths for GetScreenSize in PPB_Fullscreen and |
+// PPB_Flash_Fullscreen are the same. Consider deprecating the flash version. |
PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) { |
EnterInstance enter(instance); |
if (enter.failed()) |
return PP_FALSE; |
- return enter.functions()->GetFlashAPI()->FlashGetScreenSize(instance, size); |
+ return enter.functions()->GetScreenSize(instance, size); |
} |
const PPB_FlashFullscreen_0_1 g_ppb_flash_fullscreen_thunk = { |