diff options
author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-26 23:25:56 +0000 |
---|---|---|
committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-26 23:25:56 +0000 |
commit | d9748993cd08309a613c974ef2483cca25e3d3fc (patch) | |
tree | 9141a39c468339f48cdd046af91833cc081f7212 /ppapi/proxy | |
parent | 01d0ffd45589ad3470c6a168f68e7362f311c503 (diff) | |
download | chromium_src-d9748993cd08309a613c974ef2483cca25e3d3fc.zip chromium_src-d9748993cd08309a613c974ef2483cca25e3d3fc.tar.gz chromium_src-d9748993cd08309a613c974ef2483cca25e3d3fc.tar.bz2 |
Remove the old PPB_Flash proxy.
This removes the old, unused PPB_Flash proxy and related code.
BUG=
TBR=brettw
Review URL: https://chromiumcodereview.appspot.com/11633034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/interface_list.cc | 1 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_proxy.cc | 54 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_proxy.h | 54 | ||||
-rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 6 | ||||
-rw-r--r-- | ppapi/proxy/ppb_instance_proxy.h | 1 |
5 files changed, 0 insertions, 116 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 51537f7a..51fe853 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -85,7 +85,6 @@ #include "ppapi/proxy/ppb_file_ref_proxy.h" #include "ppapi/proxy/ppb_file_system_proxy.h" #include "ppapi/proxy/ppb_flash_message_loop_proxy.h" -#include "ppapi/proxy/ppb_flash_proxy.h" #include "ppapi/proxy/ppb_graphics_3d_proxy.h" #include "ppapi/proxy/ppb_host_resolver_private_proxy.h" #include "ppapi/proxy/ppb_image_data_proxy.h" diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc deleted file mode 100644 index 0fa79c5..0000000 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ /dev/null @@ -1,54 +0,0 @@ -// 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/proxy/ppb_flash_proxy.h" - -#include <limits> - -#include "base/logging.h" -#include "base/message_loop.h" -#include "build/build_config.h" -#include "ppapi/c/dev/ppb_var_deprecated.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/c/pp_resource.h" -#include "ppapi/c/private/ppb_flash.h" -#include "ppapi/c/private/ppb_flash_print.h" -#include "ppapi/c/trusted/ppb_browser_font_trusted.h" -#include "ppapi/proxy/host_dispatcher.h" -#include "ppapi/proxy/plugin_dispatcher.h" -#include "ppapi/proxy/plugin_globals.h" -#include "ppapi/proxy/ppapi_messages.h" -#include "ppapi/proxy/proxy_module.h" -#include "ppapi/proxy/serialized_var.h" -#include "ppapi/shared_impl/ppapi_globals.h" -#include "ppapi/shared_impl/proxy_lock.h" -#include "ppapi/shared_impl/resource.h" -#include "ppapi/shared_impl/resource_tracker.h" -#include "ppapi/shared_impl/scoped_pp_resource.h" -#include "ppapi/shared_impl/var.h" -#include "ppapi/shared_impl/var_tracker.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/ppb_url_request_info_api.h" -#include "ppapi/thunk/resource_creation_api.h" - -using ppapi::thunk::EnterInstanceNoLock; -using ppapi::thunk::EnterResourceNoLock; - -namespace ppapi { -namespace proxy { - -PPB_Flash_Proxy::PPB_Flash_Proxy(Dispatcher* dispatcher) - : InterfaceProxy(dispatcher) { -} - -PPB_Flash_Proxy::~PPB_Flash_Proxy() { -} - -bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) { - return false; -} - -} // namespace proxy -} // namespace ppapi diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h deleted file mode 100644 index 89fcb6e..0000000 --- a/ppapi/proxy/ppb_flash_proxy.h +++ /dev/null @@ -1,54 +0,0 @@ -// 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. - -#ifndef PPAPI_PROXY_PPB_FLASH_PROXY_H_ -#define PPAPI_PROXY_PPB_FLASH_PROXY_H_ - -#include <string> - -#include "base/compiler_specific.h" -#include "ppapi/c/pp_bool.h" -#include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_module.h" -#include "ppapi/c/private/ppb_flash.h" -#include "ppapi/proxy/interface_proxy.h" -#include "ppapi/proxy/serialized_var.h" -#include "ppapi/shared_impl/host_resource.h" -#include "ppapi/thunk/ppb_flash_api.h" - -struct PPB_Flash_Print_1_0; - -namespace ppapi { - -struct URLRequestInfoData; - -namespace proxy { - -struct PPBFlash_DrawGlyphs_Params; -struct SerializedDirEntry; -class SerializedVarReturnValue; - -/////////////////////////// WARNING:DEPRECTATED //////////////////////////////// -// Please do not add any new functions to this proxy. They should be -// implemented in the new-style resource proxy (see flash_resource.h). -// TODO(raymes): All of these functions should be moved to the new-style proxy. -//////////////////////////////////////////////////////////////////////////////// -class PPB_Flash_Proxy : public InterfaceProxy, public thunk::PPB_Flash_API { - public: - explicit PPB_Flash_Proxy(Dispatcher* dispatcher); - virtual ~PPB_Flash_Proxy(); - - // InterfaceProxy implementation. - virtual bool OnMessageReceived(const IPC::Message& msg); - - static const ApiID kApiID = API_ID_PPB_FLASH; - - private: - DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Proxy); -}; - -} // namespace proxy -} // namespace ppapi - -#endif // PPAPI_PROXY_PPB_FLASH_PROXY_H_ diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 08a744b..1e945e0 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -26,7 +26,6 @@ #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" -#include "ppapi/proxy/ppb_flash_proxy.h" #include "ppapi/proxy/serialized_var.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/ppb_url_util_shared.h" @@ -338,11 +337,6 @@ PP_Bool PPB_Instance_Proxy::GetScreenSize(PP_Instance instance, return result; } -thunk::PPB_Flash_API* PPB_Instance_Proxy::GetFlashAPI() { - InterfaceProxy* ip = dispatcher()->GetInterfaceProxy(API_ID_PPB_FLASH); - return static_cast<PPB_Flash_Proxy*>(ip); -} - Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance, SingletonResourceID id) { InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index 4d366d6..b62706e 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -69,7 +69,6 @@ class PPB_Instance_Proxy : public InterfaceProxy, PP_Bool fullscreen) OVERRIDE; virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) OVERRIDE; - virtual thunk::PPB_Flash_API* GetFlashAPI() OVERRIDE; virtual Resource* GetSingletonResource(PP_Instance instance, SingletonResourceID id) OVERRIDE; virtual int32_t RequestInputEvents(PP_Instance instance, |