Deprecate and remove unused PPB_Flash functions.

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 "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"
@@ skipping 56 matching lines @@
   }
 
   EnterInstance enter(instance);
   if (enter.failed())
     return PP_ERROR_BADARGUMENT;
   return enter.functions()->GetFlashAPI()->Navigate(instance, request_id,
                                                     target, from_user_action);
 }
 
 void RunMessageLoop(PP_Instance instance) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->GetFlashAPI()->RunMessageLoop(instance);
+  // Deprecated.
+  NOTREACHED();

[yzshen1, 2012/11/20 21:01:26]

nit: Please include base/logging.h.

[raymes, 2012/11/20 23:40:32]

Done.

+  return;
 }
 
 void QuitMessageLoop(PP_Instance instance) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return;
-  enter.functions()->GetFlashAPI()->QuitMessageLoop(instance);
+  // Deprecated.
+  NOTREACHED();
+  return;
 }
 
 double GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) {
   EnterInstance enter(instance);
   if (enter.failed())
     return 0.0;
   return enter.functions()->GetFlashAPI()->GetLocalTimeZoneOffset(instance, t);
 }
 
 PP_Var GetCommandLineArgs(PP_Module /* pp_module */) {
@@ skipping 22 matching lines @@
 }
 
 void UpdateActivity(PP_Instance instance) {
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->GetFlashAPI()->UpdateActivity(instance);
 }
 
 PP_Var GetDeviceID(PP_Instance instance) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return PP_MakeUndefined();
-  return enter.functions()->GetFlashAPI()->GetDeviceID(instance);
+  // Deprecated.
+  NOTREACHED();
+  return PP_MakeUndefined();
 }
 
 int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
-  EnterInstance enter(instance);
-  if (enter.failed())
-    return -1;
-  return enter.functions()->GetFlashAPI()->GetSettingInt(instance, setting);
+  // Deprecated.
+  NOTREACHED();
+  return PP_ERROR_NOTSUPPORTED;

[yzshen1, 2012/11/20 21:01:26]

Please use -1 as the previous implementation. This is not a PPAPI error result
code.

[raymes, 2012/11/20 23:40:32]

Done.

 }
 
 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);
   if (enter.failed())
     return PP_FALSE;
   return enter.functions()->GetFlashAPI()->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);
 }
 
-const PPB_Flash_12_0 g_ppb_flash_12_0_thunk = {
+const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
-  &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
-  &GetLocalTimeZoneOffset,
-  &GetCommandLineArgs,
-  &PreLoadFontWin
-};
-
-const PPB_Flash_12_1 g_ppb_flash_12_1_thunk = {
-  &SetInstanceAlwaysOnTop,
-  &DrawGlyphs,
-  &GetProxyForURL,
-  &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
-  &GetLocalTimeZoneOffset,
-  &GetCommandLineArgs,
-  &PreLoadFontWin,
-  &IsRectTopmost,
-  &InvokePrinting,
-  &UpdateActivity
-};
-
-const PPB_Flash_12_2 g_ppb_flash_12_2_thunk = {
-  &SetInstanceAlwaysOnTop,
-  &DrawGlyphs,
-  &GetProxyForURL,
-  &Navigate,
-  &RunMessageLoop,
-  &QuitMessageLoop,
-  &GetLocalTimeZoneOffset,
-  &GetCommandLineArgs,
-  &PreLoadFontWin,
-  &IsRectTopmost,
-  &InvokePrinting,
-  &UpdateActivity,
-  &GetDeviceID
-};
-
-const PPB_Flash_12_3 g_ppb_flash_12_3_thunk = {
-  &SetInstanceAlwaysOnTop,
-  &DrawGlyphs,
-  &GetProxyForURL,
   &Navigate,
   &RunMessageLoop,
   &QuitMessageLoop,
   &GetLocalTimeZoneOffset,
   &GetCommandLineArgs,
   &PreLoadFontWin,
   &IsRectTopmost,
   &InvokePrinting,
   &UpdateActivity,
   &GetDeviceID,
-  &GetSettingInt
+  &GetSettingInt,
+  &GetSetting
 };
 
-const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
+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
+  &GetSetting,
+  &SetCrashData
 };
 
-const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = {
+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
-};
-
-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
+};
+
+const PPB_Flash_13_0 g_ppb_flash_13_0_thunk = {
+  &SetInstanceAlwaysOnTop,
+  &DrawGlyphs,
+  &GetProxyForURL,
+  &Navigate,
+  &GetLocalTimeZoneOffset,
+  &GetCommandLineArgs,
+  &PreLoadFontWin,
+  &IsRectTopmost,
+  &UpdateActivity,
+  &GetSetting,
+  &SetCrashData,
+  &EnumerateVideoCaptureDevices
 };
 
 }  // namespace
 
-const PPB_Flash_12_0* GetPPB_Flash_12_0_Thunk() {
-  return &g_ppb_flash_12_0_thunk;
-}
-
-const PPB_Flash_12_1* GetPPB_Flash_12_1_Thunk() {
-  return &g_ppb_flash_12_1_thunk;
-}
-
-const PPB_Flash_12_2* GetPPB_Flash_12_2_Thunk() {
-  return &g_ppb_flash_12_2_thunk;
-}
-
-const PPB_Flash_12_3* GetPPB_Flash_12_3_Thunk() {
-  return &g_ppb_flash_12_3_thunk;
-}
-
 const PPB_Flash_12_4* GetPPB_Flash_12_4_Thunk() {
   return &g_ppb_flash_12_4_thunk;
 }
 
 const PPB_Flash_12_5* GetPPB_Flash_12_5_Thunk() {
   return &g_ppb_flash_12_5_thunk;
 }
 
 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