diff options
25 files changed, 91 insertions, 220 deletions
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index b029721..4ae1078 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -119,7 +119,6 @@ 'thunk/ppb_file_ref_thunk.cc', 'thunk/ppb_file_system_api.h', 'thunk/ppb_file_system_thunk.cc', - 'thunk/ppb_find_api.h', 'thunk/ppb_find_thunk.cc', 'thunk/ppb_flash_menu_api.h', 'thunk/ppb_flash_menu_thunk.cc', diff --git a/ppapi/proxy/interface_id.h b/ppapi/proxy/interface_id.h index 3b43943..1254adc 100644 --- a/ppapi/proxy/interface_id.h +++ b/ppapi/proxy/interface_id.h @@ -25,7 +25,6 @@ enum InterfaceID { INTERFACE_ID_PPB_FILE_CHOOSER, INTERFACE_ID_PPB_FILE_REF, INTERFACE_ID_PPB_FILE_SYSTEM, - INTERFACE_ID_PPB_FIND, INTERFACE_ID_PPB_FLASH, INTERFACE_ID_PPB_FLASH_CLIPBOARD, INTERFACE_ID_PPB_FLASH_FILE_FILEREF, diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 0b386aa..87bc815 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -181,7 +181,6 @@ InterfaceList::InterfaceList() { AddPPB(PPB_Flash_Menu_Proxy::GetInfo()); AddPPB(PPB_Flash_Proxy::GetInfo()); AddPPB(PPB_Flash_TCPSocket_Proxy::GetInfo()); - AddPPB(PPB_Instance_Proxy::GetInfoFullscreen()); AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); AddPPB(PPB_PDF_Proxy::GetInfo()); AddPPB(PPB_Testing_Proxy::GetInfo()); diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 5dcf713..e08e73a 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -59,18 +59,6 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoPrivate() { return &info; } -// static -const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoFullscreen() { - static const Info info = { - ppapi::thunk::GetPPB_Fullscreen_Thunk(), - PPB_FULLSCREEN_DEV_INTERFACE, - INTERFACE_ID_NONE, // 1_0 is the canonical one. - false, - &CreateInstanceProxy, - }; - return &info; -} - bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) { // Prevent the dispatcher from going away during a call to ExecuteScript. // This must happen OUTSIDE of ExecuteScript since the SerializedVars use @@ -183,6 +171,17 @@ void PPB_Instance_Proxy::LogWithSource(PP_Instance instance, SerializedVarSendInput(dispatcher(), value))); } +void PPB_Instance_Proxy::NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) { + NOTIMPLEMENTED(); // Not proxied yet. +} + +void PPB_Instance_Proxy::SelectedFindResultChanged(PP_Instance instance, + int32_t index) { + NOTIMPLEMENTED(); // Not proxied yet. +} + PP_Bool PPB_Instance_Proxy::IsFullscreen(PP_Instance instance) { InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> GetInstanceData(instance); diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index 4199912..74784a1 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -29,7 +29,6 @@ class PPB_Instance_Proxy : public InterfaceProxy, virtual ~PPB_Instance_Proxy(); static const Info* GetInfoPrivate(); - static const Info* GetInfoFullscreen(); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); @@ -53,6 +52,11 @@ class PPB_Instance_Proxy : public InterfaceProxy, int log_level, PP_Var source, PP_Var value) OVERRIDE; + virtual void NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) OVERRIDE; + virtual void SelectedFindResultChanged(PP_Instance instance, + int32_t index) OVERRIDE; virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE; virtual PP_Bool SetFullscreen(PP_Instance instance, PP_Bool fullscreen) OVERRIDE; diff --git a/ppapi/shared_impl/function_group_base.h b/ppapi/shared_impl/function_group_base.h index 31b164f..94d4140 100644 --- a/ppapi/shared_impl/function_group_base.h +++ b/ppapi/shared_impl/function_group_base.h @@ -12,7 +12,6 @@ #define FOR_ALL_PPAPI_FUNCTION_APIS(F) \ F(PPB_CharSet_FunctionAPI) \ F(PPB_CursorControl_FunctionAPI) \ - F(PPB_Find_FunctionAPI) \ F(PPB_Font_FunctionAPI) \ F(PPB_Fullscreen_FunctionAPI) \ F(PPB_Instance_FunctionAPI) \ diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index 3e202a5..9f164db 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -11,12 +11,17 @@ PROXIED_API(PPB_Buffer) PROXIED_API(PPB_CharSet) PROXIED_API(PPB_Context3D) PROXIED_API(PPB_CursorControl) +UNPROXIED_API(PPB_DirectoryReader) PROXIED_API(PPB_FileChooser) PROXIED_API(PPB_Font) PROXIED_API(PPB_Graphics3D) +UNPROXIED_API(PPB_LayerCompositor) +UNPROXIED_API(PPB_Scrollbar) PROXIED_API(PPB_Surface3D) +UNPROXIED_API(PPB_Transport) PROXIED_API(PPB_VideoCapture) PROXIED_API(PPB_VideoDecoder) +UNPROXIED_API(PPB_Widget) PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev) PROXIED_IFACE(PPB_CharSet, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev) @@ -26,17 +31,33 @@ PROXIED_IFACE(PPB_Context3D, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE, PPB_GLESChromiumTextureMapping_Dev) PROXIED_IFACE(PPB_CursorControl, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4, PPB_CursorControl_Dev) +UNPROXIED_IFACE(PPB_DirectoryReader, PPB_DIRECTORYREADER_DEV_INTERFACE_0_5, + PPB_DirectoryReader_Dev) +UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev) PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5, PPB_FileChooser_Dev) PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev) PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE, PPB_Console_Dev) +UNPROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_DEV_INTERFACE, PPB_Fullscreen_Dev) PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_DEV_INTERFACE_0_1, PPB_MouseLock_Dev) +UNPROXIED_IFACE(PPB_Instance, PPB_QUERY_POLICY_DEV_INTERFACE_0_1, + PPB_QueryPolicy_Dev) +UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev) +UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2, + PPB_LayerCompositor_Dev) +UNPROXIED_IFACE(PPB_Scrollbar, PPB_SCROLLBAR_DEV_INTERFACE_0_5, + PPB_Scrollbar_0_5_Dev) PROXIED_IFACE(PPB_Surface3D, PPB_SURFACE_3D_DEV_INTERFACE_0_2, PPB_Surface3D_Dev) +UNPROXIED_IFACE(PPB_Transport, PPB_TRANSPORT_DEV_INTERFACE_0_6, + PPB_Transport_Dev) PROXIED_IFACE(PPB_VideoCapture, PPB_VIDEO_CAPTURE_DEV_INTERFACE_0_1, PPB_VideoCapture_Dev) PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16, PPB_VideoDecoder_Dev) +UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE, + PPB_VideoLayer_Dev) +UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/ppapi/thunk/ppb_find_api.h b/ppapi/thunk/ppb_find_api.h deleted file mode 100644 index aacd77e..0000000 --- a/ppapi/thunk/ppb_find_api.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2011 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_THUNK_PPB_FIND_API_H_ -#define PPAPI_THUNK_PPB_FIND_API_H_ - -#include "ppapi/c/dev/ppb_find_dev.h" -#include "ppapi/proxy/interface_id.h" - -namespace ppapi { -namespace thunk { - -class PPB_Find_FunctionAPI { - public: - virtual ~PPB_Find_FunctionAPI() {} - - virtual void NumberOfFindResultsChanged(PP_Instance instance, - int32_t total, - PP_Bool final_result) = 0; - virtual void SelectedFindResultChanged(PP_Instance instance, - int32_t index) = 0; - - static const proxy::InterfaceID interface_id = proxy::INTERFACE_ID_PPB_FIND; -}; - -} // namespace thunk -} // namespace ppapi - -#endif // PPAPI_THUNK_PPB_FIND_API_H_ diff --git a/ppapi/thunk/ppb_find_thunk.cc b/ppapi/thunk/ppb_find_thunk.cc index e37e8ed..82faa3c 100644 --- a/ppapi/thunk/ppb_find_thunk.cc +++ b/ppapi/thunk/ppb_find_thunk.cc @@ -5,8 +5,6 @@ #include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/thunk/thunk.h" #include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_find_api.h" -#include "ppapi/thunk/resource_creation_api.h" namespace ppapi { namespace thunk { @@ -16,13 +14,13 @@ namespace { void NumberOfFindResultsChanged(PP_Instance instance, int32_t total, PP_Bool final) { - EnterFunction<PPB_Find_FunctionAPI> enter(instance, true); + EnterInstance enter(instance); if (enter.succeeded()) enter.functions()->NumberOfFindResultsChanged(instance, total, final); } void SelectedFindResultChanged(PP_Instance instance, int32_t index) { - EnterFunction<PPB_Find_FunctionAPI> enter(instance, true); + EnterInstance enter(instance); if (enter.succeeded()) enter.functions()->SelectedFindResultChanged(instance, index); } @@ -34,7 +32,7 @@ const PPB_Find_Dev g_ppb_find_thunk = { } // namespace -const PPB_Find_Dev* GetPPB_Find_Thunk() { +const PPB_Find_Dev* GetPPB_Find_Dev_Thunk() { return &g_ppb_find_thunk; } diff --git a/ppapi/thunk/ppb_fullscreen_thunk.cc b/ppapi/thunk/ppb_fullscreen_thunk.cc index 5cc8cc6..72081f5 100644 --- a/ppapi/thunk/ppb_fullscreen_thunk.cc +++ b/ppapi/thunk/ppb_fullscreen_thunk.cc @@ -42,7 +42,7 @@ const PPB_Fullscreen_Dev g_ppb_fullscreen_thunk = { } // namespace -const PPB_Fullscreen_Dev* GetPPB_Fullscreen_Thunk() { +const PPB_Fullscreen_Dev* GetPPB_Fullscreen_Dev_Thunk() { return &g_ppb_fullscreen_thunk; } diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h index 9a5628b..0af3f91 100644 --- a/ppapi/thunk/ppb_instance_api.h +++ b/ppapi/thunk/ppb_instance_api.h @@ -38,6 +38,13 @@ class PPB_Instance_FunctionAPI { PP_Var source, PP_Var value) = 0; + // Find. + virtual void NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) = 0; + virtual void SelectedFindResultChanged(PP_Instance instance, + int32_t index) = 0; + // Fullscreen. virtual PP_Bool IsFullscreen(PP_Instance instance) = 0; virtual PP_Bool SetFullscreen(PP_Instance instance, PP_Bool fullscreen) = 0; diff --git a/ppapi/thunk/ppb_layer_compositor_thunk.cc b/ppapi/thunk/ppb_layer_compositor_thunk.cc index 783ad4d..44a95eb 100644 --- a/ppapi/thunk/ppb_layer_compositor_thunk.cc +++ b/ppapi/thunk/ppb_layer_compositor_thunk.cc @@ -63,7 +63,7 @@ const PPB_LayerCompositor_Dev g_ppb_layer_compositor_thunk = { } // namespace -const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Thunk() { +const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Dev_Thunk() { return &g_ppb_layer_compositor_thunk; } diff --git a/ppapi/thunk/ppb_query_policy_thunk.cc b/ppapi/thunk/ppb_query_policy_thunk.cc index 468704b..24ef43b 100644 --- a/ppapi/thunk/ppb_query_policy_thunk.cc +++ b/ppapi/thunk/ppb_query_policy_thunk.cc @@ -25,7 +25,7 @@ const PPB_QueryPolicy_Dev g_ppb_querypolicy_thunk = { } // namespace -const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Thunk() { +const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Dev_Thunk() { return &g_ppb_querypolicy_thunk; } diff --git a/ppapi/thunk/ppb_scrollbar_thunk.cc b/ppapi/thunk/ppb_scrollbar_thunk.cc index 6e66483..dd0a9bb 100644 --- a/ppapi/thunk/ppb_scrollbar_thunk.cc +++ b/ppapi/thunk/ppb_scrollbar_thunk.cc @@ -87,7 +87,7 @@ const PPB_Scrollbar_0_5_Dev g_ppb_scrollbar_thunk = { } // namespace -const PPB_Scrollbar_0_5_Dev* GetPPB_Scrollbar_Thunk() { +const PPB_Scrollbar_0_5_Dev* GetPPB_Scrollbar_0_5_Dev_Thunk() { return &g_ppb_scrollbar_thunk; } diff --git a/ppapi/thunk/ppb_zoom_thunk.cc b/ppapi/thunk/ppb_zoom_thunk.cc index e7e5236..699ad80 100644 --- a/ppapi/thunk/ppb_zoom_thunk.cc +++ b/ppapi/thunk/ppb_zoom_thunk.cc @@ -35,7 +35,7 @@ const PPB_Zoom_Dev g_ppb_zoom_thunk = { } // namespace -const PPB_Zoom_Dev* GetPPB_Zoom_Thunk() { +const PPB_Zoom_Dev* GetPPB_Zoom_Dev_Thunk() { return &g_ppb_zoom_thunk; } diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h index 47d3660..c10c248 100644 --- a/ppapi/thunk/thunk.h +++ b/ppapi/thunk/thunk.h @@ -28,72 +28,43 @@ struct PPB_AudioTrusted; struct PPB_BrokerTrusted; -struct PPB_Buffer_Dev; struct PPB_BufferTrusted; -struct PPB_CharSet_Dev; -struct PPB_Console_Dev; struct PPB_Context3DTrusted_Dev; -struct PPB_CursorControl_Dev; -struct PPB_DirectoryReader_Dev; -struct PPB_FileChooser_Dev; struct PPB_FileIOTrusted; -struct PPB_Find_Dev; struct PPB_Flash_Menu; struct PPB_Flash_NetConnector; struct PPB_Flash_TCPSocket; -struct PPB_Font_Dev; -struct PPB_Fullscreen_Dev; struct PPB_Graphics3D; struct PPB_Graphics3DTrusted; -struct PPB_ImageData; struct PPB_ImageDataTrusted; struct PPB_Instance_Private; -struct PPB_LayerCompositor_Dev; struct PPB_QueryPolicy_Dev; -struct PPB_Scrollbar_0_5_Dev; -struct PPB_Surface3D_Dev; -struct PPB_Transport_Dev; struct PPB_URLLoaderTrusted; -struct PPB_VideoCapture_Dev; -struct PPB_VideoDecoder_Dev; -struct PPB_VideoLayer_Dev; -struct PPB_Widget_Dev; -struct PPB_Zoom_Dev; typedef PPB_Instance PPB_Instance_1_0; namespace ppapi { namespace thunk { +// Old-style thunk getters. Only put trusted/private stuff here (it hasn't +// yet been converted to the new system). Otherwise, add the declaration to +// the appropriate interfaces_*.h file. PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk(); PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk(); PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Console_Dev* GetPPB_Console_Dev_Thunk(); PPAPI_THUNK_EXPORT const PPB_Context3DTrusted_Dev* GetPPB_Context3DTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_CursorControl_Dev* GetPPB_CursorControl_Thunk(); -PPAPI_THUNK_EXPORT const PPB_DirectoryReader_Dev* - GetPPB_DirectoryReader_Dev_Thunk(); PPAPI_THUNK_EXPORT const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Find_Dev* GetPPB_Find_Thunk(); PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk(); PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector* GetPPB_Flash_NetConnector_Thunk(); PPAPI_THUNK_EXPORT const PPB_Flash_TCPSocket* GetPPB_Flash_TCPSocket_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Fullscreen_Dev* GetPPB_Fullscreen_Thunk(); PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted* GetPPB_Graphics3DTrusted_Thunk(); PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk(); PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk(); -PPAPI_THUNK_EXPORT const PPB_LayerCompositor_Dev* - GetPPB_LayerCompositor_Thunk(); PPAPI_THUNK_EXPORT const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Scrollbar_0_5_Dev* GetPPB_Scrollbar_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Transport_Dev* GetPPB_Transport_Dev_Thunk(); PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_VideoLayer_Dev* GetPPB_VideoLayer_Dev_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Widget_Dev* GetPPB_Widget_Dev_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Zoom_Dev* GetPPB_Zoom_Thunk(); } // namespace thunk } // namespace ppapi diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index cb126a6..025c3f6 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -241,8 +241,6 @@ '../plugins/ppapi/ppb_file_ref_impl.h', '../plugins/ppapi/ppb_file_system_impl.cc', '../plugins/ppapi/ppb_file_system_impl.h', - '../plugins/ppapi/ppb_find_impl.cc', - '../plugins/ppapi/ppb_find_impl.h', '../plugins/ppapi/ppb_flash_clipboard_impl.cc', '../plugins/ppapi/ppb_flash_clipboard_impl.h', '../plugins/ppapi/ppb_flash_file_impl.cc', diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index efb8859..6ca43f8 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -253,12 +253,8 @@ const void* GetInterface(const char* name) { return &core_interface; if (strcmp(name, PPB_CRYPTO_DEV_INTERFACE) == 0) return PPB_Crypto_Impl::GetInterface(); - if (strcmp(name, PPB_DIRECTORYREADER_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_DirectoryReader_Dev_Thunk(); if (strcmp(name, PPB_FILEIOTRUSTED_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk(); - if (strcmp(name, PPB_FIND_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Find_Thunk(); if (strcmp(name, PPB_FLASH_INTERFACE) == 0) return PPB_Flash_Impl::GetInterface(); if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE) == 0) @@ -271,8 +267,6 @@ const void* GetInterface(const char* name) { return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk(); if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk(); - if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Fullscreen_Thunk(); if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0) return PPB_GpuBlacklist_Private_Impl::GetInterface(); if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) @@ -283,22 +277,16 @@ const void* GetInterface(const char* name) { return ::ppapi::thunk::GetPPB_InputEvent_Thunk(); if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); - if (strcmp(name, PPB_LAYER_COMPOSITOR_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_LayerCompositor_Thunk(); if (strcmp(name, PPB_MEMORY_DEV_INTERFACE) == 0) return PPB_Memory_Impl::GetInterface(); if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0) return PPB_OpenGLES_Impl::GetInterface(); if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) return PPB_Proxy_Impl::GetInterface(); - if (strcmp(name, PPB_QUERY_POLICY_DEV_INTERFACE_0_1) == 0) - return ::ppapi::thunk::GetPPB_QueryPolicy_Thunk(); if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_4) == 0) return PPB_Scrollbar_Impl::Get0_4Interface(); if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_3) == 0) return PPB_Scrollbar_Impl::Get0_3Interface(); - if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_5) == 0) - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk(); if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0) return PPB_UMA_Private_Impl::GetInterface(); if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0) @@ -309,23 +297,12 @@ const void* GetInterface(const char* name) { return PPB_Var_Impl::GetVarDeprecatedInterface(); if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0) return PPB_Var_Impl::GetVarInterface(); - if (strcmp(name, PPB_VIDEOLAYER_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_VideoLayer_Dev_Thunk(); - if (strcmp(name, PPB_WIDGET_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Widget_Dev_Thunk(); - if (strcmp(name, PPB_ZOOM_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Zoom_Thunk(); #ifdef ENABLE_FLAPPER_HACKS if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_Flash_NetConnector_Thunk(); #endif // ENABLE_FLAPPER_HACKS -#if defined(ENABLE_P2P_APIS) - if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Transport_Dev_Thunk(); -#endif - // Only support the testing interface when the command line switch is // specified. This allows us to prevent people from (ab)using this interface // in production code. diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index de6c892..0425cd4 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1492,6 +1492,20 @@ void PluginInstance::LogWithSource(PP_Instance instance, WebConsoleMessage(web_level, WebString(UTF8ToUTF16(message)))); } +void PluginInstance::NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) { + DCHECK_NE(find_identifier_, -1); + delegate_->NumberOfFindResultsChanged(find_identifier_, total, + PP_ToBool(final_result)); +} + +void PluginInstance::SelectedFindResultChanged(PP_Instance instance, + int32_t index) { + DCHECK_NE(find_identifier_, -1); + delegate_->SelectedFindResultChanged(find_identifier_, index); +} + PP_Bool PluginInstance::IsFullscreen(PP_Instance instance) { return PP_FromBool(fullscreen_); } diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index 643828a..54a2b90 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -106,8 +106,6 @@ class PluginInstance : public base::RefCounted<PluginInstance>, const gfx::Rect& position() const { return position_; } const gfx::Rect& clip() const { return clip_; } - int find_identifier() const { return find_identifier_; } - void set_always_on_top(bool on_top) { always_on_top_ = on_top; } // Returns the PP_Instance uniquely identifying this instance. Guaranteed @@ -271,6 +269,11 @@ class PluginInstance : public base::RefCounted<PluginInstance>, int log_level, PP_Var source, PP_Var value) OVERRIDE; + virtual void NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) OVERRIDE; + virtual void SelectedFindResultChanged(PP_Instance instance, + int32_t index) OVERRIDE; virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE; virtual PP_Bool SetFullscreen(PP_Instance instance, PP_Bool fullscreen) OVERRIDE; diff --git a/webkit/plugins/ppapi/ppb_find_impl.cc b/webkit/plugins/ppapi/ppb_find_impl.cc deleted file mode 100644 index d83bc19..0000000 --- a/webkit/plugins/ppapi/ppb_find_impl.cc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_find_impl.h" - -#include "webkit/plugins/ppapi/plugin_delegate.h" -#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" - -using ::ppapi::thunk::PPB_Find_FunctionAPI; - -namespace webkit { -namespace ppapi { - -PPB_Find_Impl::PPB_Find_Impl(PluginInstance* instance) : instance_(instance) { -} - -PPB_Find_Impl::~PPB_Find_Impl() { -} - -PPB_Find_FunctionAPI* PPB_Find_Impl::AsPPB_Find_FunctionAPI() { - return this; -} - -void PPB_Find_Impl::NumberOfFindResultsChanged(PP_Instance instance, - int32_t total, - PP_Bool final_result) { - DCHECK_NE(instance_->find_identifier(), -1); - instance_->delegate()->NumberOfFindResultsChanged( - instance_->find_identifier(), total, PP_ToBool(final_result)); -} - -void PPB_Find_Impl::SelectedFindResultChanged(PP_Instance instance, - int32_t index) { - DCHECK_NE(instance_->find_identifier(), -1); - instance_->delegate()->SelectedFindResultChanged( - instance_->find_identifier(), index); -} - -} // namespace ppapi -} // namespace webkit diff --git a/webkit/plugins/ppapi/ppb_find_impl.h b/webkit/plugins/ppapi/ppb_find_impl.h deleted file mode 100644 index b6675cd..0000000 --- a/webkit/plugins/ppapi/ppb_find_impl.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2011 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 WEBKIT_PLUGINS_PPAPI_PPB_FIND_IMPL_H_ -#define WEBKIT_PLUGINS_PPAPI_PPB_FIND_IMPL_H_ - -#include "base/basictypes.h" -#include "base/compiler_specific.h" -#include "ppapi/shared_impl/function_group_base.h" -#include "ppapi/thunk/ppb_find_api.h" - -namespace webkit { -namespace ppapi { - -class PluginInstance; - -// Some of the backend functionality of this class is implemented by the -// AudioImpl so it can be shared with the proxy. -class PPB_Find_Impl : public ::ppapi::FunctionGroupBase, - public ::ppapi::thunk::PPB_Find_FunctionAPI { - public: - PPB_Find_Impl(PluginInstance* instance); - virtual ~PPB_Find_Impl(); - - // FunctionBase overrides. - virtual ::ppapi::thunk::PPB_Find_FunctionAPI* AsPPB_Find_FunctionAPI() - OVERRIDE; - - // PPB_Find_API implementation. - virtual void NumberOfFindResultsChanged(PP_Instance instance, - int32_t total, - PP_Bool final_result) OVERRIDE; - virtual void SelectedFindResultChanged(PP_Instance instance, - int32_t index) OVERRIDE; - - private: - PluginInstance* instance_; - - DISALLOW_COPY_AND_ASSIGN(PPB_Find_Impl); -}; - -} // namespace ppapi -} // namespace webkit - -#endif // WEBKIT_PLUGINS_PPAPI_PPB_FIND_IMPL_H_ diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc index 8d33358..ea93ff0 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc @@ -42,11 +42,13 @@ namespace { // the GetThickness call which has no parameters. PP_Resource Create(PP_Instance instance, PP_Bool vertical) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->Create(instance, vertical); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->Create(instance, + vertical); } PP_Bool IsScrollbar(PP_Resource resource) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->IsScrollbar(resource); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->IsScrollbar( + resource); } uint32_t GetThickness3() { @@ -54,34 +56,34 @@ uint32_t GetThickness3() { } uint32_t GetThickness4(PP_Resource resource) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->GetThickness(resource); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->GetThickness( + resource); } uint32_t GetValue(PP_Resource resource) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->GetValue(resource); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->GetValue(resource); } void SetValue(PP_Resource resource, uint32_t value) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->SetValue(resource, value); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->SetValue(resource, + value); } void SetDocumentSize(PP_Resource resource, uint32_t size) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->SetDocumentSize(resource, - size); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->SetDocumentSize( + resource, size); } void SetTickMarks(PP_Resource resource, const PP_Rect* tick_marks, uint32_t count) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->SetTickMarks(resource, - tick_marks, - count); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->SetTickMarks( + resource, tick_marks, count); } void ScrollBy(PP_Resource resource, PP_ScrollBy_Dev unit, int32_t multiplier) { - return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->ScrollBy(resource, - unit, - multiplier); + return ::ppapi::thunk::GetPPB_Scrollbar_0_5_Dev_Thunk()->ScrollBy( + resource, unit, multiplier); } const PPB_Scrollbar_0_3_Dev ppb_scrollbar_0_3 = { diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index eeffefb..311c35a 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -252,7 +252,9 @@ PP_Resource ResourceCreationImpl::CreateSurface3D( PP_Resource ResourceCreationImpl::CreateTransport(PP_Instance instance, const char* name, const char* proto) { +#if defined(ENABLE_P2P_APIS) return PPB_Transport_Impl::Create(instance, name, proto); +#endif } PP_Resource ResourceCreationImpl::CreateURLLoader(PP_Instance instance) { diff --git a/webkit/plugins/ppapi/resource_tracker.cc b/webkit/plugins/ppapi/resource_tracker.cc index a97ee0c..c69fb5f 100644 --- a/webkit/plugins/ppapi/resource_tracker.cc +++ b/webkit/plugins/ppapi/resource_tracker.cc @@ -20,7 +20,6 @@ #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/ppb_char_set_impl.h" #include "webkit/plugins/ppapi/ppb_cursor_control_impl.h" -#include "webkit/plugins/ppapi/ppb_find_impl.h" #include "webkit/plugins/ppapi/ppb_font_impl.h" #include "webkit/plugins/ppapi/resource_creation_impl.h" #include "webkit/plugins/ppapi/resource_helper.h" @@ -142,9 +141,6 @@ void ResourceTracker::CleanupInstanceData(PP_Instance instance, case ::ppapi::proxy::INTERFACE_ID_PPB_CURSORCONTROL: proxy.reset(new PPB_CursorControl_Impl(instance)); break; - case ::ppapi::proxy::INTERFACE_ID_PPB_FIND: - proxy.reset(new PPB_Find_Impl(instance)); - break; case ::ppapi::proxy::INTERFACE_ID_PPB_FONT: proxy.reset(new PPB_Font_FunctionImpl(instance)); break; |