Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(931)

Unified Diff: ppapi/thunk/ppb_flash_thunk.cc

Issue 11411102: Deprecate and remove unused PPB_Flash functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/thunk/ppb_flash_api.h ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_flash_thunk.cc
diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc
index ec8e17e326fb957706c5b67852086551e40e4b3c..15b132a333a4aaa86bd5a46d2d90211dbf1090af 100644
--- a/ppapi/thunk/ppb_flash_thunk.cc
+++ b/ppapi/thunk/ppb_flash_thunk.cc
@@ -2,6 +2,7 @@
// 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"
@@ -74,17 +75,15 @@ int32_t Navigate(PP_Resource request_id,
}
void RunMessageLoop(PP_Instance instance) {
- EnterInstance enter(instance);
- if (enter.failed())
- return;
- enter.functions()->GetFlashAPI()->RunMessageLoop(instance);
+ // Deprecated.
+ NOTREACHED();
+ 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) {
@@ -127,17 +126,15 @@ void UpdateActivity(PP_Instance 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 -1;
}
PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) {
@@ -165,50 +162,7 @@ int32_t EnumerateVideoCaptureDevices(PP_Instance instance,
return enter.object()->EnumerateDevicesSync(devices);
}
-const PPB_Flash_12_0 g_ppb_flash_12_0_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 = {
+const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
&SetInstanceAlwaysOnTop,
&DrawGlyphs,
&GetProxyForURL,
@@ -222,10 +176,11 @@ const PPB_Flash_12_3 g_ppb_flash_12_3_thunk = {
&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,
@@ -240,10 +195,11 @@ const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
&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,
@@ -259,24 +215,20 @@ const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = {
&GetDeviceID,
&GetSettingInt,
&GetSetting,
- &SetCrashData
+ &SetCrashData,
+ &EnumerateVideoCaptureDevices
};
-const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = {
+const PPB_Flash_13_0 g_ppb_flash_13_0_thunk = {
&SetInstanceAlwaysOnTop,
&DrawGlyphs,
&GetProxyForURL,
&Navigate,
- &RunMessageLoop,
- &QuitMessageLoop,
&GetLocalTimeZoneOffset,
&GetCommandLineArgs,
&PreLoadFontWin,
&IsRectTopmost,
- &InvokePrinting,
&UpdateActivity,
- &GetDeviceID,
- &GetSettingInt,
&GetSetting,
&SetCrashData,
&EnumerateVideoCaptureDevices
@@ -284,22 +236,6 @@ const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = {
} // 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;
}
@@ -312,5 +248,9 @@ 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
« no previous file with comments | « ppapi/thunk/ppb_flash_api.h ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698