Index: ppapi/thunk/ppb_flash_thunk.cc |
diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc |
index 574df8709ebbe7edc17de66c19e5e413cd156d30..e92faa22a577f383fcd8358c889bb6b468bf6622 100644 |
--- a/ppapi/thunk/ppb_flash_thunk.cc |
+++ b/ppapi/thunk/ppb_flash_thunk.cc |
@@ -41,9 +41,17 @@ PP_Bool DrawGlyphs(PP_Instance instance, |
EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance); |
if (enter.failed()) |
return PP_FALSE; |
- return enter.functions()->DrawGlyphs( |
- instance, pp_image_data, font_desc, color, position, clip, transformation, |
- allow_subpixel_aa, glyph_count, glyph_indices, glyph_advances); |
+ return enter.functions()->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) { |
@@ -69,8 +77,8 @@ int32_t Navigate(PP_Resource request_id, |
EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance); |
if (enter.failed()) |
return PP_ERROR_BADARGUMENT; |
- return enter.functions()->Navigate(instance, request_id, target, |
- from_user_action); |
+ return enter.functions()->Navigate( |
+ instance, request_id, target, from_user_action); |
} |
void RunMessageLoop(PP_Instance instance) { |
@@ -143,9 +151,7 @@ PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) { |
return enter.functions()->GetSetting(instance, setting); |
} |
-PP_Bool SetCrashData(PP_Instance instance, |
- PP_FlashCrashKey key, |
- PP_Var value) { |
+PP_Bool SetCrashData(PP_Instance instance, PP_FlashCrashKey key, PP_Var value) { |
EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance); |
if (enter.failed()) |
return PP_FALSE; |
@@ -162,76 +168,35 @@ int32_t EnumerateVideoCaptureDevices(PP_Instance instance, |
} |
const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = { |
- &SetInstanceAlwaysOnTop, |
- &DrawGlyphs, |
- &GetProxyForURL, |
- &Navigate, |
- &RunMessageLoop, |
- &QuitMessageLoop, |
- &GetLocalTimeZoneOffset, |
- &GetCommandLineArgs, |
- &PreLoadFontWin, |
- &IsRectTopmost, |
- &InvokePrinting, |
- &UpdateActivity, |
- &GetDeviceID, |
- &GetSettingInt, |
- &GetSetting |
-}; |
+ &SetInstanceAlwaysOnTop, &DrawGlyphs, &GetProxyForURL, |
+ &Navigate, &RunMessageLoop, &QuitMessageLoop, |
+ &GetLocalTimeZoneOffset, &GetCommandLineArgs, &PreLoadFontWin, |
+ &IsRectTopmost, &InvokePrinting, &UpdateActivity, |
+ &GetDeviceID, &GetSettingInt, &GetSetting}; |
const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = { |
- &SetInstanceAlwaysOnTop, |
- &DrawGlyphs, |
- &GetProxyForURL, |
- &Navigate, |
- &RunMessageLoop, |
- &QuitMessageLoop, |
- &GetLocalTimeZoneOffset, |
- &GetCommandLineArgs, |
- &PreLoadFontWin, |
- &IsRectTopmost, |
- &InvokePrinting, |
- &UpdateActivity, |
- &GetDeviceID, |
- &GetSettingInt, |
- &GetSetting, |
- &SetCrashData |
-}; |
+ &SetInstanceAlwaysOnTop, &DrawGlyphs, &GetProxyForURL, |
+ &Navigate, &RunMessageLoop, &QuitMessageLoop, |
+ &GetLocalTimeZoneOffset, &GetCommandLineArgs, &PreLoadFontWin, |
+ &IsRectTopmost, &InvokePrinting, &UpdateActivity, |
+ &GetDeviceID, &GetSettingInt, &GetSetting, |
+ &SetCrashData}; |
const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = { |
- &SetInstanceAlwaysOnTop, |
- &DrawGlyphs, |
- &GetProxyForURL, |
- &Navigate, |
- &RunMessageLoop, |
- &QuitMessageLoop, |
- &GetLocalTimeZoneOffset, |
- &GetCommandLineArgs, |
- &PreLoadFontWin, |
- &IsRectTopmost, |
- &InvokePrinting, |
- &UpdateActivity, |
- &GetDeviceID, |
- &GetSettingInt, |
- &GetSetting, |
- &SetCrashData, |
- &EnumerateVideoCaptureDevices |
-}; |
+ &SetInstanceAlwaysOnTop, &DrawGlyphs, &GetProxyForURL, |
+ &Navigate, &RunMessageLoop, &QuitMessageLoop, |
+ &GetLocalTimeZoneOffset, &GetCommandLineArgs, &PreLoadFontWin, |
+ &IsRectTopmost, &InvokePrinting, &UpdateActivity, |
+ &GetDeviceID, &GetSettingInt, &GetSetting, |
+ &SetCrashData, &EnumerateVideoCaptureDevices}; |
const PPB_Flash_13_0 g_ppb_flash_13_0_thunk = { |
- &SetInstanceAlwaysOnTop, |
- &DrawGlyphs, |
- &GetProxyForURL, |
- &Navigate, |
- &GetLocalTimeZoneOffset, |
- &GetCommandLineArgs, |
- &PreLoadFontWin, |
- &IsRectTopmost, |
- &UpdateActivity, |
- &GetSetting, |
- &SetCrashData, |
- &EnumerateVideoCaptureDevices |
-}; |
+ &SetInstanceAlwaysOnTop, &DrawGlyphs, |
+ &GetProxyForURL, &Navigate, |
+ &GetLocalTimeZoneOffset, &GetCommandLineArgs, |
+ &PreLoadFontWin, &IsRectTopmost, |
+ &UpdateActivity, &GetSetting, |
+ &SetCrashData, &EnumerateVideoCaptureDevices}; |
} // namespace |