diff options
57 files changed, 515 insertions, 533 deletions
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc index 5dabe47..9edfa11 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc @@ -68,17 +68,17 @@ int32_t PepperFlashBrowserHost::OnResourceMessageReceived( ppapi::host::HostMessageContext* context) { IPC_BEGIN_MESSAGE_MAP(PepperFlashBrowserHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_UpdateActivity, - OnMsgUpdateActivity); + OnUpdateActivity); PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetLocalTimeZoneOffset, - OnMsgGetLocalTimeZoneOffset); + OnGetLocalTimeZoneOffset); PPAPI_DISPATCH_HOST_RESOURCE_CALL_0( PpapiHostMsg_Flash_GetLocalDataRestrictions, - OnMsgGetLocalDataRestrictions); + OnGetLocalDataRestrictions); IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperFlashBrowserHost::OnMsgUpdateActivity( +int32_t PepperFlashBrowserHost::OnUpdateActivity( ppapi::host::HostMessageContext* host_context) { #if defined(OS_WIN) // Reading then writing back the same value to the screensaver timeout system @@ -96,7 +96,7 @@ int32_t PepperFlashBrowserHost::OnMsgUpdateActivity( return PP_OK; } -int32_t PepperFlashBrowserHost::OnMsgGetLocalTimeZoneOffset( +int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset( ppapi::host::HostMessageContext* host_context, const base::Time& t) { // The reason for this processing being in the browser process is that on @@ -107,7 +107,7 @@ int32_t PepperFlashBrowserHost::OnMsgGetLocalTimeZoneOffset( return PP_OK; } -int32_t PepperFlashBrowserHost::OnMsgGetLocalDataRestrictions( +int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions( ppapi::host::HostMessageContext* context) { // Getting the Flash LSO settings requires using the CookieSettings which // belong to the profile which lives on the UI thread. We lazily initialize diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h index 466e4f4..5aa815e 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h @@ -38,11 +38,11 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgUpdateActivity(ppapi::host::HostMessageContext* host_context); - int32_t OnMsgGetLocalTimeZoneOffset( + int32_t OnUpdateActivity(ppapi::host::HostMessageContext* host_context); + int32_t OnGetLocalTimeZoneOffset( ppapi::host::HostMessageContext* host_context, const base::Time& t); - int32_t OnMsgGetLocalDataRestrictions( + int32_t OnGetLocalDataRestrictions( ppapi::host::HostMessageContext* context); void GetLocalDataRestrictions(ppapi::host::ReplyMessageContext reply_context, diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc index 619382d..4e73c56 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc @@ -39,7 +39,7 @@ bool SearchProviderInstallStateMessageFilter::OnMessageReceived( *message_was_ok) IPC_MESSAGE_HANDLER_DELAY_REPLY( ChromeViewHostMsg_GetSearchProviderInstallState, - OnMsgGetSearchProviderInstallState) + OnGetSearchProviderInstallState) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -82,7 +82,7 @@ SearchProviderInstallStateMessageFilter::GetSearchProviderInstallState( } void -SearchProviderInstallStateMessageFilter::OnMsgGetSearchProviderInstallState( +SearchProviderInstallStateMessageFilter::OnGetSearchProviderInstallState( const GURL& page_location, const GURL& requested_host, IPC::Message* reply_msg) { diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_message_filter.h index 66e44b6..5a66e93 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.h @@ -34,9 +34,9 @@ class SearchProviderInstallStateMessageFilter const GURL& requested_host); // Starts handling the message requesting the search provider install state. - void OnMsgGetSearchProviderInstallState(const GURL& page_location, - const GURL& requested_host, - IPC::Message* reply_msg); + void OnGetSearchProviderInstallState(const GURL& page_location, + const GURL& requested_host, + IPC::Message* reply_msg); // Sends the reply message about the search provider install state. void ReplyWithProviderInstallState(const GURL& page_location, diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc index 901afd0..bb8eea5 100644 --- a/chrome/nacl/nacl_listener.cc +++ b/chrome/nacl/nacl_listener.cc @@ -184,13 +184,13 @@ void NaClListener::Listen() { bool NaClListener::OnMessageReceived(const IPC::Message& msg) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(NaClListener, msg) - IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnMsgStart) + IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnStart) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -void NaClListener::OnMsgStart(const nacl::NaClStartParams& params) { +void NaClListener::OnStart(const nacl::NaClStartParams& params) { struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate(); if (args == NULL) { LOG(ERROR) << "NaClChromeMainArgsCreate() failed"; diff --git a/chrome/nacl/nacl_listener.h b/chrome/nacl/nacl_listener.h index 7f75ee4..20e3e78 100644 --- a/chrome/nacl/nacl_listener.h +++ b/chrome/nacl/nacl_listener.h @@ -36,7 +36,7 @@ class NaClListener : public IPC::Listener { #endif private: - void OnMsgStart(const nacl::NaClStartParams& params); + void OnStart(const nacl::NaClStartParams& params); virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; // A channel back to the browser. diff --git a/chrome/renderer/chrome_mock_render_thread.cc b/chrome/renderer/chrome_mock_render_thread.cc index dd72285..79b1f73 100644 --- a/chrome/renderer/chrome_mock_render_thread.cc +++ b/chrome/renderer/chrome_mock_render_thread.cc @@ -40,7 +40,7 @@ bool ChromeMockRenderThread::OnMessageReceived(const IPC::Message& msg) { bool msg_is_ok = true; IPC_BEGIN_MESSAGE_MAP_EX(ChromeMockRenderThread, msg, msg_is_ok) IPC_MESSAGE_HANDLER(ExtensionHostMsg_OpenChannelToExtension, - OnMsgOpenChannelToExtension) + OnOpenChannelToExtension) IPC_MESSAGE_HANDLER(PrintHostMsg_GetDefaultPrintSettings, OnGetDefaultPrintSettings) IPC_MESSAGE_HANDLER(PrintHostMsg_ScriptedPrint, OnScriptedPrint) @@ -66,7 +66,7 @@ bool ChromeMockRenderThread::OnMessageReceived(const IPC::Message& msg) { return handled; } -void ChromeMockRenderThread::OnMsgOpenChannelToExtension( +void ChromeMockRenderThread::OnOpenChannelToExtension( int routing_id, const std::string& source_extension_id, const std::string& target_extension_id, diff --git a/chrome/renderer/chrome_mock_render_thread.h b/chrome/renderer/chrome_mock_render_thread.h index 5db8826..c3b3c7a 100644 --- a/chrome/renderer/chrome_mock_render_thread.h +++ b/chrome/renderer/chrome_mock_render_thread.h @@ -51,11 +51,11 @@ class ChromeMockRenderThread : public content::MockRenderThread { virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; // The callee expects to be returned a valid channel_id. - void OnMsgOpenChannelToExtension(int routing_id, - const std::string& extension_id, - const std::string& source_extension_id, - const std::string& target_extension_id, - int* port_id); + void OnOpenChannelToExtension(int routing_id, + const std::string& extension_id, + const std::string& source_extension_id, + const std::string& target_extension_id, + int* port_id); #if defined(OS_CHROMEOS) void OnAllocateTempFileForPrinting(base::FileDescriptor* renderer_fd, diff --git a/chrome/renderer/pepper/pepper_flash_font_file_host.cc b/chrome/renderer/pepper/pepper_flash_font_file_host.cc index a568618..b427265 100644 --- a/chrome/renderer/pepper/pepper_flash_font_file_host.cc +++ b/chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -44,12 +44,12 @@ int32_t PepperFlashFontFileHost::OnResourceMessageReceived( ppapi::host::HostMessageContext* context) { IPC_BEGIN_MESSAGE_MAP(PepperFlashFontFileHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashFontFile_GetFontTable, - OnMsgGetFontTable) + OnGetFontTable) IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperFlashFontFileHost::OnMsgGetFontTable( +int32_t PepperFlashFontFileHost::OnGetFontTable( ppapi::host::HostMessageContext* context, uint32_t table) { std::string contents; diff --git a/chrome/renderer/pepper/pepper_flash_font_file_host.h b/chrome/renderer/pepper/pepper_flash_font_file_host.h index 3ea884a..ad60c6f 100644 --- a/chrome/renderer/pepper/pepper_flash_font_file_host.h +++ b/chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -37,8 +37,8 @@ class PepperFlashFontFileHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgGetFontTable(ppapi::host::HostMessageContext* context, - uint32_t table); + int32_t OnGetFontTable(ppapi::host::HostMessageContext* context, + uint32_t table); // Non-owning pointer. content::RendererPpapiHost* renderer_ppapi_host_; diff --git a/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc b/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc index 45ca836..a14423d 100644 --- a/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc +++ b/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc @@ -31,12 +31,12 @@ int32_t PepperFlashFullscreenHost::OnResourceMessageReceived( IPC_BEGIN_MESSAGE_MAP(PepperFlashFullscreenHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL( PpapiHostMsg_FlashFullscreen_SetFullscreen, - OnMsgSetFullscreen) + OnSetFullscreen) IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperFlashFullscreenHost::OnMsgSetFullscreen( +int32_t PepperFlashFullscreenHost::OnSetFullscreen( ppapi::host::HostMessageContext* context, bool fullscreen) { webkit::ppapi::PluginInstance* plugin_instance = diff --git a/chrome/renderer/pepper/pepper_flash_fullscreen_host.h b/chrome/renderer/pepper/pepper_flash_fullscreen_host.h index 37e7d46..a98432e 100644 --- a/chrome/renderer/pepper/pepper_flash_fullscreen_host.h +++ b/chrome/renderer/pepper/pepper_flash_fullscreen_host.h @@ -27,8 +27,8 @@ class PepperFlashFullscreenHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgSetFullscreen(ppapi::host::HostMessageContext* context, - bool fullscreen); + int32_t OnSetFullscreen(ppapi::host::HostMessageContext* context, + bool fullscreen); // Non-owning pointer. content::RendererPpapiHost* renderer_ppapi_host_; diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc index b907286..c76f7c6 100644 --- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc +++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc @@ -58,22 +58,22 @@ int32_t PepperFlashRendererHost::OnResourceMessageReceived( ppapi::host::HostMessageContext* context) { IPC_BEGIN_MESSAGE_MAP(PepperFlashRendererHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetProxyForURL, - OnMsgGetProxyForURL); + OnGetProxyForURL); PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop, - OnMsgSetInstanceAlwaysOnTop); + OnSetInstanceAlwaysOnTop); PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_DrawGlyphs, - OnMsgDrawGlyphs); + OnDrawGlyphs); PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_Navigate, - OnMsgNavigate); + OnNavigate); PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_IsRectTopmost, - OnMsgIsRectTopmost); + OnIsRectTopmost); PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_InvokePrinting, - OnMsgInvokePrinting); + OnInvokePrinting); IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperFlashRendererHost::OnMsgGetProxyForURL( +int32_t PepperFlashRendererHost::OnGetProxyForURL( ppapi::host::HostMessageContext* host_context, const std::string& url) { GURL gurl(url); @@ -87,7 +87,7 @@ int32_t PepperFlashRendererHost::OnMsgGetProxyForURL( return PP_OK; } -int32_t PepperFlashRendererHost::OnMsgSetInstanceAlwaysOnTop( +int32_t PepperFlashRendererHost::OnSetInstanceAlwaysOnTop( ppapi::host::HostMessageContext* host_context, bool on_top) { webkit::ppapi::PluginInstance* plugin_instance = @@ -99,7 +99,7 @@ int32_t PepperFlashRendererHost::OnMsgSetInstanceAlwaysOnTop( return PP_OK; } -int32_t PepperFlashRendererHost::OnMsgDrawGlyphs( +int32_t PepperFlashRendererHost::OnDrawGlyphs( ppapi::host::HostMessageContext* host_context, ppapi::proxy::PPBFlash_DrawGlyphs_Params params) { if (params.glyph_indices.size() != params.glyph_advances.size() || @@ -194,7 +194,7 @@ int32_t PepperFlashRendererHost::OnMsgDrawGlyphs( // cause re-entrancy or cause the instance to be destroyed. If the instance // is destroyed we need to ensure that we respond to all outstanding sync // messages so that the plugin process does not remain blocked. -int32_t PepperFlashRendererHost::OnMsgNavigate( +int32_t PepperFlashRendererHost::OnNavigate( ppapi::host::HostMessageContext* host_context, const ppapi::URLRequestInfoData& data, const std::string& target, @@ -232,7 +232,7 @@ int32_t PepperFlashRendererHost::OnMsgNavigate( return PP_OK_COMPLETIONPENDING; } -int32_t PepperFlashRendererHost::OnMsgIsRectTopmost( +int32_t PepperFlashRendererHost::OnIsRectTopmost( ppapi::host::HostMessageContext* host_context, const PP_Rect& rect) { webkit::ppapi::PluginInstance* plugin_instance = @@ -243,7 +243,7 @@ int32_t PepperFlashRendererHost::OnMsgIsRectTopmost( return PP_ERROR_FAILED; } -int32_t PepperFlashRendererHost::OnMsgInvokePrinting( +int32_t PepperFlashRendererHost::OnInvokePrinting( ppapi::host::HostMessageContext* host_context) { PPB_PDF_Impl::InvokePrintingForInstance(pp_instance()); return PP_OK; diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.h b/chrome/renderer/pepper/pepper_flash_renderer_host.h index fadb27a..299b109 100644 --- a/chrome/renderer/pepper/pepper_flash_renderer_host.h +++ b/chrome/renderer/pepper/pepper_flash_renderer_host.h @@ -44,20 +44,20 @@ class PepperFlashRendererHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgGetProxyForURL(ppapi::host::HostMessageContext* host_context, - const std::string& url); - int32_t OnMsgSetInstanceAlwaysOnTop( + int32_t OnGetProxyForURL(ppapi::host::HostMessageContext* host_context, + const std::string& url); + int32_t OnSetInstanceAlwaysOnTop( ppapi::host::HostMessageContext* host_context, bool on_top); - int32_t OnMsgDrawGlyphs(ppapi::host::HostMessageContext* host_context, - ppapi::proxy::PPBFlash_DrawGlyphs_Params params); - int32_t OnMsgNavigate(ppapi::host::HostMessageContext* host_context, - const ppapi::URLRequestInfoData& data, - const std::string& target, + int32_t OnDrawGlyphs(ppapi::host::HostMessageContext* host_context, + ppapi::proxy::PPBFlash_DrawGlyphs_Params params); + int32_t OnNavigate(ppapi::host::HostMessageContext* host_context, + const ppapi::URLRequestInfoData& data, + const std::string& target, bool from_user_action); - int32_t OnMsgIsRectTopmost(ppapi::host::HostMessageContext* host_context, - const PP_Rect& rect); - int32_t OnMsgInvokePrinting(ppapi::host::HostMessageContext* host_context); + int32_t OnIsRectTopmost(ppapi::host::HostMessageContext* host_context, + const PP_Rect& rect); + int32_t OnInvokePrinting(ppapi::host::HostMessageContext* host_context); base::WeakPtrFactory<PepperFlashRendererHost> weak_factory_; // A stack of ReplyMessageContexts to track Navigate() calls which have not diff --git a/chrome/renderer/print_web_view_helper_browsertest.cc b/chrome/renderer/print_web_view_helper_browsertest.cc index da942f3..a172a9b 100644 --- a/chrome/renderer/print_web_view_helper_browsertest.cc +++ b/chrome/renderer/print_web_view_helper_browsertest.cc @@ -347,7 +347,7 @@ TEST_F(PrintWebViewHelperTest, PrintLayoutTest) { LoadHTML(kTestPages[i].page); PrintWebViewHelper::Get(view_)->OnPrintPages(); - // MockRenderThread::Send() just calls MockRenderThread::OnMsgReceived(). + // MockRenderThread::Send() just calls MockRenderThread::OnReceived(). // So, all IPC messages sent in the above RenderView::OnPrintPages() call // has been handled by the MockPrinter object, i.e. this printing job // has been already finished. diff --git a/content/browser/browser_plugin/browser_plugin_message_filter.cc b/content/browser/browser_plugin/browser_plugin_message_filter.cc index fda1205..857c5f1 100644 --- a/content/browser/browser_plugin/browser_plugin_message_filter.cc +++ b/content/browser/browser_plugin/browser_plugin_message_filter.cc @@ -23,13 +23,13 @@ bool BrowserPluginMessageFilter::OnMessageReceived( bool* message_was_ok) { bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(BrowserPluginMessageFilter, message, *message_was_ok) - IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnMsgCreateWindow) + IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -void BrowserPluginMessageFilter::OnMsgCreateWindow( +void BrowserPluginMessageFilter::OnCreateWindow( const ViewHostMsg_CreateWindow_Params& params, int* route_id, int* surface_id, diff --git a/content/browser/browser_plugin/browser_plugin_message_filter.h b/content/browser/browser_plugin/browser_plugin_message_filter.h index 26ac9a2..6d268d0 100644 --- a/content/browser/browser_plugin/browser_plugin_message_filter.h +++ b/content/browser/browser_plugin/browser_plugin_message_filter.h @@ -25,7 +25,7 @@ class BrowserPluginMessageFilter : public BrowserMessageFilter { private: virtual ~BrowserPluginMessageFilter(); - void OnMsgCreateWindow( + void OnCreateWindow( const ViewHostMsg_CreateWindow_Params& params, int* route_id, int* surface_id, diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.cc b/content/browser/renderer_host/pepper/pepper_gamepad_host.cc index 267fce2..1edb1ba7 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host.cc +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.cc @@ -47,12 +47,12 @@ int32_t PepperGamepadHost::OnResourceMessageReceived( ppapi::host::HostMessageContext* context) { IPC_BEGIN_MESSAGE_MAP(PepperGamepadHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Gamepad_RequestMemory, - OnMsgRequestMemory) + OnRequestMemory) IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperGamepadHost::OnMsgRequestMemory( +int32_t PepperGamepadHost::OnRequestMemory( ppapi::host::HostMessageContext* context) { if (is_started_) return PP_ERROR_FAILED; diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.h b/content/browser/renderer_host/pepper/pepper_gamepad_host.h index 2cc846c..1db73aa 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host.h +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.h @@ -41,7 +41,7 @@ class CONTENT_EXPORT PepperGamepadHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgRequestMemory(ppapi::host::HostMessageContext* context); + int32_t OnRequestMemory(ppapi::host::HostMessageContext* context); void GotUserGesture(const ppapi::host::ReplyMessageContext& in_context); diff --git a/content/browser/renderer_host/pepper/pepper_printing_host.cc b/content/browser/renderer_host/pepper/pepper_printing_host.cc index 4d898ee..959d589 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host.cc +++ b/content/browser/renderer_host/pepper/pepper_printing_host.cc @@ -32,12 +32,12 @@ int32_t PepperPrintingHost::OnResourceMessageReceived( IPC_BEGIN_MESSAGE_MAP(PepperPrintingHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL_0( PpapiHostMsg_Printing_GetDefaultPrintSettings, - OnMsgGetDefaultPrintSettings) + OnGetDefaultPrintSettings) IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperPrintingHost::OnMsgGetDefaultPrintSettings( +int32_t PepperPrintingHost::OnGetDefaultPrintSettings( ppapi::host::HostMessageContext* context) { print_settings_manager_->GetDefaultPrintSettings( base::Bind(&PepperPrintingHost::PrintSettingsCallback, diff --git a/content/browser/renderer_host/pepper/pepper_printing_host.h b/content/browser/renderer_host/pepper/pepper_printing_host.h index e7bb90d..4c302ee 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host.h +++ b/content/browser/renderer_host/pepper/pepper_printing_host.h @@ -30,7 +30,7 @@ class CONTENT_EXPORT PepperPrintingHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgGetDefaultPrintSettings( + int32_t OnGetDefaultPrintSettings( ppapi::host::HostMessageContext* context); void PrintSettingsCallback( diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index f6493bb..cd5dfad 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -370,10 +370,10 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message, OnPreCacheFontCharacters) #endif IPC_MESSAGE_HANDLER(ViewHostMsg_GenerateRoutingID, OnGenerateRoutingID) - IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnMsgCreateWindow) - IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnMsgCreateWidget) + IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow) + IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_CreateFullscreenWidget, - OnMsgCreateFullscreenWidget) + OnCreateFullscreenWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_SetCookie, OnSetCookie) IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetCookies, OnGetCookies) IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetRawCookies, OnGetRawCookies) @@ -450,7 +450,7 @@ bool RenderMessageFilter::OffTheRecord() const { return incognito_; } -void RenderMessageFilter::OnMsgCreateWindow( +void RenderMessageFilter::OnCreateWindow( const ViewHostMsg_CreateWindow_Params& params, int* route_id, int* surface_id, @@ -485,17 +485,17 @@ void RenderMessageFilter::OnMsgCreateWindow( cloned_namespace); } -void RenderMessageFilter::OnMsgCreateWidget(int opener_id, - WebKit::WebPopupType popup_type, - int* route_id, - int* surface_id) { +void RenderMessageFilter::OnCreateWidget(int opener_id, + WebKit::WebPopupType popup_type, + int* route_id, + int* surface_id) { render_widget_helper_->CreateNewWidget( opener_id, popup_type, route_id, surface_id); } -void RenderMessageFilter::OnMsgCreateFullscreenWidget(int opener_id, - int* route_id, - int* surface_id) { +void RenderMessageFilter::OnCreateFullscreenWidget(int opener_id, + int* route_id, + int* surface_id) { render_widget_helper_->CreateNewFullscreenWidget( opener_id, route_id, surface_id); } diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index fdc933f..3ba8de3 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -113,17 +113,17 @@ class RenderMessageFilter : public BrowserMessageFilter { virtual ~RenderMessageFilter(); - void OnMsgCreateWindow(const ViewHostMsg_CreateWindow_Params& params, - int* route_id, - int* surface_id, - int64* cloned_session_storage_namespace_id); - void OnMsgCreateWidget(int opener_id, - WebKit::WebPopupType popup_type, - int* route_id, - int* surface_id); - void OnMsgCreateFullscreenWidget(int opener_id, - int* route_id, - int* surface_id); + void OnCreateWindow(const ViewHostMsg_CreateWindow_Params& params, + int* route_id, + int* surface_id, + int64* cloned_session_storage_namespace_id); + void OnCreateWidget(int opener_id, + WebKit::WebPopupType popup_type, + int* route_id, + int* surface_id); + void OnCreateFullscreenWidget(int opener_id, + int* route_id, + int* surface_id); void OnSetCookie(const IPC::Message& message, const GURL& url, const GURL& first_party_for_cookies, diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index b49410c..69cafaf 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -384,10 +384,10 @@ void RenderViewHostImpl::FirePageBeforeUnload(bool for_cross_site_transition) { if (!IsRenderViewLive()) { // This RenderViewHostImpl doesn't have a live renderer, so just // skip running the onbeforeunload handler. - is_waiting_for_beforeunload_ack_ = true; // Checked by OnMsgShouldCloseACK. + is_waiting_for_beforeunload_ack_ = true; // Checked by OnShouldCloseACK. unload_ack_is_for_cross_site_transition_ = for_cross_site_transition; base::TimeTicks now = base::TimeTicks::Now(); - OnMsgShouldCloseACK(true, now, now); + OnShouldCloseACK(true, now, now); return; } @@ -956,68 +956,66 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { bool handled = true; bool msg_is_ok = true; IPC_BEGIN_MESSAGE_MAP_EX(RenderViewHostImpl, msg, msg_is_ok) - IPC_MESSAGE_HANDLER(ViewHostMsg_ShowView, OnMsgShowView) - IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnMsgShowWidget) + IPC_MESSAGE_HANDLER(ViewHostMsg_ShowView, OnShowView) + IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowFullscreenWidget, - OnMsgShowFullscreenWidget) - IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunModal, OnMsgRunModal) - IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnMsgRenderViewReady) - IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewGone, OnMsgRenderViewGone) + OnShowFullscreenWidget) + IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunModal, OnRunModal) + IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady) + IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewGone, OnRenderViewGone) IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame, - OnMsgDidStartProvisionalLoadForFrame) + OnDidStartProvisionalLoadForFrame) IPC_MESSAGE_HANDLER(ViewHostMsg_DidRedirectProvisionalLoad, - OnMsgDidRedirectProvisionalLoad) + OnDidRedirectProvisionalLoad) IPC_MESSAGE_HANDLER(ViewHostMsg_DidFailProvisionalLoadWithError, - OnMsgDidFailProvisionalLoadWithError) - IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_FrameNavigate, OnMsgNavigate(msg)) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateState, OnMsgUpdateState) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTitle, OnMsgUpdateTitle) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateEncoding, OnMsgUpdateEncoding) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTargetURL, OnMsgUpdateTargetURL) + OnDidFailProvisionalLoadWithError) + IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_FrameNavigate, OnNavigate(msg)) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateState, OnUpdateState) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTitle, OnUpdateTitle) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateEncoding, OnUpdateEncoding) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTargetURL, OnUpdateTargetURL) IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateInspectorSetting, OnUpdateInspectorSetting) - IPC_MESSAGE_HANDLER(ViewHostMsg_Close, OnMsgClose) - IPC_MESSAGE_HANDLER(ViewHostMsg_RequestMove, OnMsgRequestMove) - IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartLoading, OnMsgDidStartLoading) - IPC_MESSAGE_HANDLER(ViewHostMsg_DidStopLoading, OnMsgDidStopLoading) + IPC_MESSAGE_HANDLER(ViewHostMsg_Close, OnClose) + IPC_MESSAGE_HANDLER(ViewHostMsg_RequestMove, OnRequestMove) + IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartLoading, OnDidStartLoading) + IPC_MESSAGE_HANDLER(ViewHostMsg_DidStopLoading, OnDidStopLoading) IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeLoadProgress, - OnMsgDidChangeLoadProgress) - IPC_MESSAGE_HANDLER(ViewHostMsg_DidDisownOpener, - OnMsgDidDisownOpener) + OnDidChangeLoadProgress) + IPC_MESSAGE_HANDLER(ViewHostMsg_DidDisownOpener, OnDidDisownOpener) IPC_MESSAGE_HANDLER(ViewHostMsg_DocumentAvailableInMainFrame, - OnMsgDocumentAvailableInMainFrame) + OnDocumentAvailableInMainFrame) IPC_MESSAGE_HANDLER(ViewHostMsg_DocumentOnLoadCompletedInMainFrame, - OnMsgDocumentOnLoadCompletedInMainFrame) - IPC_MESSAGE_HANDLER(ViewHostMsg_ContextMenu, OnMsgContextMenu) - IPC_MESSAGE_HANDLER(ViewHostMsg_ToggleFullscreen, - OnMsgToggleFullscreen) - IPC_MESSAGE_HANDLER(ViewHostMsg_OpenURL, OnMsgOpenURL) + OnDocumentOnLoadCompletedInMainFrame) + IPC_MESSAGE_HANDLER(ViewHostMsg_ContextMenu, OnContextMenu) + IPC_MESSAGE_HANDLER(ViewHostMsg_ToggleFullscreen, OnToggleFullscreen) + IPC_MESSAGE_HANDLER(ViewHostMsg_OpenURL, OnOpenURL) IPC_MESSAGE_HANDLER(ViewHostMsg_DidContentsPreferredSizeChange, - OnMsgDidContentsPreferredSizeChange) + OnDidContentsPreferredSizeChange) IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeScrollbarsForMainFrame, - OnMsgDidChangeScrollbarsForMainFrame) + OnDidChangeScrollbarsForMainFrame) IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeScrollOffsetPinningForMainFrame, - OnMsgDidChangeScrollOffsetPinningForMainFrame) + OnDidChangeScrollOffsetPinningForMainFrame) IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeNumWheelEvents, - OnMsgDidChangeNumWheelEvents) + OnDidChangeNumWheelEvents) IPC_MESSAGE_HANDLER(ViewHostMsg_RouteCloseEvent, - OnMsgRouteCloseEvent) - IPC_MESSAGE_HANDLER(ViewHostMsg_RouteMessageEvent, OnMsgRouteMessageEvent) + OnRouteCloseEvent) + IPC_MESSAGE_HANDLER(ViewHostMsg_RouteMessageEvent, OnRouteMessageEvent) IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunJavaScriptMessage, - OnMsgRunJavaScriptMessage) + OnRunJavaScriptMessage) IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunBeforeUnloadConfirm, - OnMsgRunBeforeUnloadConfirm) - IPC_MESSAGE_HANDLER(DragHostMsg_StartDragging, OnMsgStartDragging) + OnRunBeforeUnloadConfirm) + IPC_MESSAGE_HANDLER(DragHostMsg_StartDragging, OnStartDragging) IPC_MESSAGE_HANDLER(DragHostMsg_UpdateDragCursor, OnUpdateDragCursor) IPC_MESSAGE_HANDLER(DragHostMsg_TargetDrop_ACK, OnTargetDropACK) IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus) IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnFocusedNodeChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole) - IPC_MESSAGE_HANDLER(ViewHostMsg_ShouldClose_ACK, OnMsgShouldCloseACK) - IPC_MESSAGE_HANDLER(ViewHostMsg_ClosePage_ACK, OnMsgClosePageACK) - IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionChanged, OnMsgSelectionChanged) + IPC_MESSAGE_HANDLER(ViewHostMsg_ShouldClose_ACK, OnShouldCloseACK) + IPC_MESSAGE_HANDLER(ViewHostMsg_ClosePage_ACK, OnClosePageACK) + IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionChanged, OnSelectionChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionBoundsChanged, - OnMsgSelectionBoundsChanged) + OnSelectionBoundsChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_ScriptEvalResponse, OnScriptEvalResponse) IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL) IPC_MESSAGE_HANDLER(ViewHostMsg_MediaNotification, OnMediaNotification) @@ -1025,7 +1023,7 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { #if defined(OS_ANDROID) IPC_MESSAGE_HANDLER(ViewHostMsg_StartContentIntent, OnStartContentIntent) IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeBodyBackgroundColor, - OnMsgDidChangeBodyBackgroundColor) + OnDidChangeBodyBackgroundColor) #endif IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_RequestPermission, OnRequestDesktopNotificationPermission) @@ -1034,7 +1032,7 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Cancel, OnCancelDesktopNotification) #if defined(OS_MACOSX) || defined(OS_ANDROID) - IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnMsgShowPopup) + IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup) #endif IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser) IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse, @@ -1096,10 +1094,10 @@ void RenderViewHostImpl::CreateNewFullscreenWidget(int route_id) { delegate_->CreateNewFullscreenWidget(route_id); } -void RenderViewHostImpl::OnMsgShowView(int route_id, - WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, - bool user_gesture) { +void RenderViewHostImpl::OnShowView(int route_id, + WindowOpenDisposition disposition, + const gfx::Rect& initial_pos, + bool user_gesture) { if (!is_swapped_out_) { delegate_->ShowCreatedWindow( route_id, disposition, initial_pos, user_gesture); @@ -1107,20 +1105,20 @@ void RenderViewHostImpl::OnMsgShowView(int route_id, Send(new ViewMsg_Move_ACK(route_id)); } -void RenderViewHostImpl::OnMsgShowWidget(int route_id, - const gfx::Rect& initial_pos) { +void RenderViewHostImpl::OnShowWidget(int route_id, + const gfx::Rect& initial_pos) { if (!is_swapped_out_) delegate_->ShowCreatedWidget(route_id, initial_pos); Send(new ViewMsg_Move_ACK(route_id)); } -void RenderViewHostImpl::OnMsgShowFullscreenWidget(int route_id) { +void RenderViewHostImpl::OnShowFullscreenWidget(int route_id) { if (!is_swapped_out_) delegate_->ShowCreatedFullscreenWidget(route_id); Send(new ViewMsg_Move_ACK(route_id)); } -void RenderViewHostImpl::OnMsgRunModal(int opener_id, IPC::Message* reply_msg) { +void RenderViewHostImpl::OnRunModal(int opener_id, IPC::Message* reply_msg) { DCHECK(!run_modal_reply_msg_); run_modal_reply_msg_ = reply_msg; run_modal_opener_id_ = opener_id; @@ -1140,14 +1138,14 @@ void RenderViewHostImpl::OnMsgRunModal(int opener_id, IPC::Message* reply_msg) { // an app-modal fashion. } -void RenderViewHostImpl::OnMsgRenderViewReady() { +void RenderViewHostImpl::OnRenderViewReady() { render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING; SendScreenRects(); WasResized(); delegate_->RenderViewReady(this); } -void RenderViewHostImpl::OnMsgRenderViewGone(int status, int exit_code) { +void RenderViewHostImpl::OnRenderViewGone(int status, int exit_code) { // Keep the termination status so we can get at it later when we // need to know why it died. render_view_termination_status_ = @@ -1164,7 +1162,7 @@ void RenderViewHostImpl::OnMsgRenderViewGone(int status, int exit_code) { exit_code); } -void RenderViewHostImpl::OnMsgDidStartProvisionalLoadForFrame( +void RenderViewHostImpl::OnDidStartProvisionalLoadForFrame( int64 frame_id, int64 parent_frame_id, bool is_main_frame, @@ -1173,7 +1171,7 @@ void RenderViewHostImpl::OnMsgDidStartProvisionalLoadForFrame( this, frame_id, parent_frame_id, is_main_frame, url); } -void RenderViewHostImpl::OnMsgDidRedirectProvisionalLoad( +void RenderViewHostImpl::OnDidRedirectProvisionalLoad( int32 page_id, const GURL& source_url, const GURL& target_url) { @@ -1181,7 +1179,7 @@ void RenderViewHostImpl::OnMsgDidRedirectProvisionalLoad( this, page_id, source_url, target_url); } -void RenderViewHostImpl::OnMsgDidFailProvisionalLoadWithError( +void RenderViewHostImpl::OnDidFailProvisionalLoadWithError( const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params) { delegate_->DidFailProvisionalLoadWithError(this, params); } @@ -1194,7 +1192,7 @@ void RenderViewHostImpl::OnMsgDidFailProvisionalLoadWithError( // level frame. If the user explicitly requests a subframe navigation, we will // get a new page_id because we need to create a new navigation entry for that // action. -void RenderViewHostImpl::OnMsgNavigate(const IPC::Message& msg) { +void RenderViewHostImpl::OnNavigate(const IPC::Message& msg) { // Read the parameters out of the IPC message directly to avoid making another // copy when we filter the URLs. PickleIterator iter(msg); @@ -1212,7 +1210,7 @@ void RenderViewHostImpl::OnMsgNavigate(const IPC::Message& msg) { if (is_waiting_for_beforeunload_ack_ && unload_ack_is_for_cross_site_transition_ && PageTransitionIsMainFrame(validated_params.transition)) { - OnMsgShouldCloseACK(true, send_should_close_start_time_, + OnShouldCloseACK(true, send_should_close_start_time_, base::TimeTicks::Now()); return; } @@ -1270,12 +1268,12 @@ void RenderViewHostImpl::OnMsgNavigate(const IPC::Message& msg) { // http://crbug.com/153701 is fixed. } -void RenderViewHostImpl::OnMsgUpdateState(int32 page_id, - const std::string& state) { +void RenderViewHostImpl::OnUpdateState(int32 page_id, + const std::string& state) { delegate_->UpdateState(this, page_id, state); } -void RenderViewHostImpl::OnMsgUpdateTitle( +void RenderViewHostImpl::OnUpdateTitle( int32 page_id, const string16& title, WebKit::WebTextDirection title_direction) { @@ -1289,12 +1287,11 @@ void RenderViewHostImpl::OnMsgUpdateTitle( title_direction)); } -void RenderViewHostImpl::OnMsgUpdateEncoding(const std::string& encoding_name) { +void RenderViewHostImpl::OnUpdateEncoding(const std::string& encoding_name) { delegate_->UpdateEncoding(this, encoding_name); } -void RenderViewHostImpl::OnMsgUpdateTargetURL(int32 page_id, - const GURL& url) { +void RenderViewHostImpl::OnUpdateTargetURL(int32 page_id, const GURL& url) { if (!is_swapped_out_) delegate_->UpdateTargetURL(page_id, url); @@ -1309,44 +1306,44 @@ void RenderViewHostImpl::OnUpdateInspectorSetting( this, key, value); } -void RenderViewHostImpl::OnMsgClose() { +void RenderViewHostImpl::OnClose() { // If the renderer is telling us to close, it has already run the unload // events, and we can take the fast path. ClosePageIgnoringUnloadEvents(); } -void RenderViewHostImpl::OnMsgRequestMove(const gfx::Rect& pos) { +void RenderViewHostImpl::OnRequestMove(const gfx::Rect& pos) { if (!is_swapped_out_) delegate_->RequestMove(pos); Send(new ViewMsg_Move_ACK(GetRoutingID())); } -void RenderViewHostImpl::OnMsgDidStartLoading() { +void RenderViewHostImpl::OnDidStartLoading() { delegate_->DidStartLoading(this); } -void RenderViewHostImpl::OnMsgDidStopLoading() { +void RenderViewHostImpl::OnDidStopLoading() { delegate_->DidStopLoading(this); } -void RenderViewHostImpl::OnMsgDidChangeLoadProgress(double load_progress) { +void RenderViewHostImpl::OnDidChangeLoadProgress(double load_progress) { delegate_->DidChangeLoadProgress(load_progress); } -void RenderViewHostImpl::OnMsgDidDisownOpener() { +void RenderViewHostImpl::OnDidDisownOpener() { delegate_->DidDisownOpener(this); } -void RenderViewHostImpl::OnMsgDocumentAvailableInMainFrame() { +void RenderViewHostImpl::OnDocumentAvailableInMainFrame() { delegate_->DocumentAvailableInMainFrame(this); } -void RenderViewHostImpl::OnMsgDocumentOnLoadCompletedInMainFrame( +void RenderViewHostImpl::OnDocumentOnLoadCompletedInMainFrame( int32 page_id) { delegate_->DocumentOnLoadCompletedInMainFrame(this, page_id); } -void RenderViewHostImpl::OnMsgContextMenu(const ContextMenuParams& params) { +void RenderViewHostImpl::OnContextMenu(const ContextMenuParams& params) { // Validate the URLs in |params|. If the renderer can't request the URLs // directly, don't show them in the context menu. ContextMenuParams validated_params(params); @@ -1372,13 +1369,13 @@ void RenderViewHostImpl::OnMsgContextMenu(const ContextMenuParams& params) { delegate_->ShowContextMenu(validated_params, type); } -void RenderViewHostImpl::OnMsgToggleFullscreen(bool enter_fullscreen) { +void RenderViewHostImpl::OnToggleFullscreen(bool enter_fullscreen) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); delegate_->ToggleFullscreenMode(enter_fullscreen); WasResized(); } -void RenderViewHostImpl::OnMsgOpenURL( +void RenderViewHostImpl::OnOpenURL( const ViewHostMsg_OpenURL_Params& params) { GURL validated_url(params.url); FilterURL(ChildProcessSecurityPolicyImpl::GetInstance(), @@ -1389,7 +1386,7 @@ void RenderViewHostImpl::OnMsgOpenURL( params.is_cross_site_redirect); } -void RenderViewHostImpl::OnMsgDidContentsPreferredSizeChange( +void RenderViewHostImpl::OnDidContentsPreferredSizeChange( const gfx::Size& new_size) { delegate_->UpdatePreferredSize(new_size); } @@ -1398,29 +1395,29 @@ void RenderViewHostImpl::OnRenderAutoResized(const gfx::Size& new_size) { delegate_->ResizeDueToAutoResize(new_size); } -void RenderViewHostImpl::OnMsgDidChangeScrollbarsForMainFrame( +void RenderViewHostImpl::OnDidChangeScrollbarsForMainFrame( bool has_horizontal_scrollbar, bool has_vertical_scrollbar) { if (view_) view_->SetHasHorizontalScrollbar(has_horizontal_scrollbar); } -void RenderViewHostImpl::OnMsgDidChangeScrollOffsetPinningForMainFrame( +void RenderViewHostImpl::OnDidChangeScrollOffsetPinningForMainFrame( bool is_pinned_to_left, bool is_pinned_to_right) { if (view_) view_->SetScrollOffsetPinning(is_pinned_to_left, is_pinned_to_right); } -void RenderViewHostImpl::OnMsgDidChangeNumWheelEvents(int count) { +void RenderViewHostImpl::OnDidChangeNumWheelEvents(int count) { } -void RenderViewHostImpl::OnMsgSelectionChanged(const string16& text, - size_t offset, - const ui::Range& range) { +void RenderViewHostImpl::OnSelectionChanged(const string16& text, + size_t offset, + const ui::Range& range) { if (view_) view_->SelectionChanged(text, offset, range); } -void RenderViewHostImpl::OnMsgSelectionBoundsChanged( +void RenderViewHostImpl::OnSelectionBoundsChanged( const gfx::Rect& start_rect, WebKit::WebTextDirection start_direction, const gfx::Rect& end_rect, @@ -1431,18 +1428,18 @@ void RenderViewHostImpl::OnMsgSelectionBoundsChanged( } } -void RenderViewHostImpl::OnMsgRouteCloseEvent() { +void RenderViewHostImpl::OnRouteCloseEvent() { // Have the delegate route this to the active RenderViewHost. delegate_->RouteCloseEvent(this); } -void RenderViewHostImpl::OnMsgRouteMessageEvent( +void RenderViewHostImpl::OnRouteMessageEvent( const ViewMsg_PostMessage_Params& params) { // Give to the delegate to route to the active RenderViewHost. delegate_->RouteMessageEvent(this, params); } -void RenderViewHostImpl::OnMsgRunJavaScriptMessage( +void RenderViewHostImpl::OnRunJavaScriptMessage( const string16& message, const string16& default_prompt, const GURL& frame_url, @@ -1457,10 +1454,10 @@ void RenderViewHostImpl::OnMsgRunJavaScriptMessage( &are_javascript_messages_suppressed_); } -void RenderViewHostImpl::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, - const string16& message, - bool is_reload, - IPC::Message* reply_msg) { +void RenderViewHostImpl::OnRunBeforeUnloadConfirm(const GURL& frame_url, + const string16& message, + bool is_reload, + IPC::Message* reply_msg) { // While a JS before unload dialog is showing, tabs in the same process // shouldn't process input events. GetProcess()->SetIgnoreInputEvents(true); @@ -1468,7 +1465,7 @@ void RenderViewHostImpl::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, delegate_->RunBeforeUnloadConfirm(this, message, is_reload, reply_msg); } -void RenderViewHostImpl::OnMsgStartDragging( +void RenderViewHostImpl::OnStartDragging( const WebDropData& drop_data, WebDragOperationsMask drag_operations_mask, const SkBitmap& bitmap, @@ -1564,14 +1561,14 @@ void RenderViewHostImpl::OnUserGesture() { delegate_->OnUserGesture(); } -void RenderViewHostImpl::OnMsgShouldCloseACK( +void RenderViewHostImpl::OnShouldCloseACK( bool proceed, const base::TimeTicks& renderer_before_unload_start_time, const base::TimeTicks& renderer_before_unload_end_time) { decrement_in_flight_event_count(); StopHangMonitorTimeout(); // If this renderer navigated while the beforeunload request was in flight, we - // may have cleared this state in OnMsgNavigate, in which case we can ignore + // may have cleared this state in OnNavigate, in which case we can ignore // this message. if (!is_waiting_for_beforeunload_ack_ || is_swapped_out_) return; @@ -1609,7 +1606,7 @@ void RenderViewHostImpl::OnMsgShouldCloseACK( delegate_->DidCancelLoading(); } -void RenderViewHostImpl::OnMsgClosePageACK() { +void RenderViewHostImpl::OnClosePageACK() { decrement_in_flight_event_count(); ClosePageIgnoringUnloadEvents(); } @@ -1632,13 +1629,13 @@ bool RenderViewHostImpl::IsFullscreen() const { return delegate_->IsFullscreenForCurrentTab(); } -void RenderViewHostImpl::OnMsgFocus() { +void RenderViewHostImpl::OnFocus() { // Note: We allow focus and blur from swapped out RenderViewHosts, even when // the active RenderViewHost is in a different BrowsingInstance (e.g., WebUI). delegate_->Activate(); } -void RenderViewHostImpl::OnMsgBlur() { +void RenderViewHostImpl::OnBlur() { delegate_->Deactivate(); } @@ -1972,7 +1969,7 @@ void RenderViewHostImpl::OnMediaNotification(int64 player_cookie, } #if defined(OS_ANDROID) -void RenderViewHostImpl::OnMsgDidChangeBodyBackgroundColor(SkColor color) { +void RenderViewHostImpl::OnDidChangeBodyBackgroundColor(SkColor color) { if (GetView()) GetView()->SetCachedBackgroundColor(color); } @@ -2010,7 +2007,7 @@ void RenderViewHostImpl::OnCancelDesktopNotification(int notification_id) { } #if defined(OS_MACOSX) || defined(OS_ANDROID) -void RenderViewHostImpl::OnMsgShowPopup( +void RenderViewHostImpl::OnShowPopup( const ViewHostMsg_ShowPopup_Params& params) { RenderViewHostDelegateView* view = delegate_->GetDelegateView(); if (view) { @@ -2050,7 +2047,7 @@ void RenderViewHostImpl::SetSwappedOut(bool is_swapped_out) { // Whenever we change swap out state, we should not be waiting for // beforeunload or unload acks. We clear them here to be safe, since they - // can cause navigations to be ignored in OnMsgNavigate. + // can cause navigations to be ignored in OnNavigate. is_waiting_for_beforeunload_ack_ = false; is_waiting_for_unload_ack_ = false; has_timed_out_on_unload_ = false; diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 6aee5890..930597e 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -468,77 +468,76 @@ class CONTENT_EXPORT RenderViewHostImpl virtual void RequestToLockMouse(bool user_gesture, bool last_unlocked_by_target) OVERRIDE; virtual bool IsFullscreen() const OVERRIDE; - virtual void OnMsgFocus() OVERRIDE; - virtual void OnMsgBlur() OVERRIDE; + virtual void OnFocus() OVERRIDE; + virtual void OnBlur() OVERRIDE; // IPC message handlers. - void OnMsgShowView(int route_id, - WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, - bool user_gesture); - void OnMsgShowWidget(int route_id, const gfx::Rect& initial_pos); - void OnMsgShowFullscreenWidget(int route_id); - void OnMsgRunModal(int opener_id, IPC::Message* reply_msg); - void OnMsgRenderViewReady(); - void OnMsgRenderViewGone(int status, int error_code); - void OnMsgDidStartProvisionalLoadForFrame(int64 frame_id, - int64 parent_frame_id, - bool main_frame, - const GURL& url); - void OnMsgDidRedirectProvisionalLoad(int32 page_id, - const GURL& source_url, - const GURL& target_url); - void OnMsgDidFailProvisionalLoadWithError( + void OnShowView(int route_id, + WindowOpenDisposition disposition, + const gfx::Rect& initial_pos, + bool user_gesture); + void OnShowWidget(int route_id, const gfx::Rect& initial_pos); + void OnShowFullscreenWidget(int route_id); + void OnRunModal(int opener_id, IPC::Message* reply_msg); + void OnRenderViewReady(); + void OnRenderViewGone(int status, int error_code); + void OnDidStartProvisionalLoadForFrame(int64 frame_id, + int64 parent_frame_id, + bool main_frame, + const GURL& url); + void OnDidRedirectProvisionalLoad(int32 page_id, + const GURL& source_url, + const GURL& target_url); + void OnDidFailProvisionalLoadWithError( const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params); - void OnMsgNavigate(const IPC::Message& msg); - void OnMsgUpdateState(int32 page_id, - const std::string& state); - void OnMsgUpdateTitle(int32 page_id, - const string16& title, - WebKit::WebTextDirection title_direction); - void OnMsgUpdateEncoding(const std::string& encoding); - void OnMsgUpdateTargetURL(int32 page_id, const GURL& url); - void OnMsgClose(); - void OnMsgRequestMove(const gfx::Rect& pos); - void OnMsgDidStartLoading(); - void OnMsgDidStopLoading(); - void OnMsgDidChangeLoadProgress(double load_progress); - void OnMsgDidDisownOpener(); - void OnMsgDocumentAvailableInMainFrame(); - void OnMsgDocumentOnLoadCompletedInMainFrame(int32 page_id); - void OnMsgContextMenu(const ContextMenuParams& params); - void OnMsgToggleFullscreen(bool enter_fullscreen); - void OnMsgOpenURL(const ViewHostMsg_OpenURL_Params& params); - void OnMsgDidContentsPreferredSizeChange(const gfx::Size& new_size); - void OnMsgDidChangeScrollbarsForMainFrame(bool has_horizontal_scrollbar, - bool has_vertical_scrollbar); - void OnMsgDidChangeScrollOffsetPinningForMainFrame(bool is_pinned_to_left, - bool is_pinned_to_right); - void OnMsgDidChangeNumWheelEvents(int count); - void OnMsgSelectionChanged(const string16& text, - size_t offset, - const ui::Range& range); - void OnMsgSelectionBoundsChanged(const gfx::Rect& start_rect, - WebKit::WebTextDirection start_direction, - const gfx::Rect& end_rect, - WebKit::WebTextDirection end_direction); - void OnMsgPasteFromSelectionClipboard(); - void OnMsgRouteCloseEvent(); - void OnMsgRouteMessageEvent(const ViewMsg_PostMessage_Params& params); - void OnMsgRunJavaScriptMessage(const string16& message, - const string16& default_prompt, - const GURL& frame_url, - JavaScriptMessageType type, - IPC::Message* reply_msg); - void OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, - const string16& message, - bool is_reload, - IPC::Message* reply_msg); - void OnMsgStartDragging(const WebDropData& drop_data, - WebKit::WebDragOperationsMask operations_allowed, - const SkBitmap& bitmap, - const gfx::Vector2d& bitmap_offset_in_dip, - const DragEventSourceInfo& event_info); + void OnNavigate(const IPC::Message& msg); + void OnUpdateState(int32 page_id, const std::string& state); + void OnUpdateTitle(int32 page_id, + const string16& title, + WebKit::WebTextDirection title_direction); + void OnUpdateEncoding(const std::string& encoding); + void OnUpdateTargetURL(int32 page_id, const GURL& url); + void OnClose(); + void OnRequestMove(const gfx::Rect& pos); + void OnDidStartLoading(); + void OnDidStopLoading(); + void OnDidChangeLoadProgress(double load_progress); + void OnDidDisownOpener(); + void OnDocumentAvailableInMainFrame(); + void OnDocumentOnLoadCompletedInMainFrame(int32 page_id); + void OnContextMenu(const ContextMenuParams& params); + void OnToggleFullscreen(bool enter_fullscreen); + void OnOpenURL(const ViewHostMsg_OpenURL_Params& params); + void OnDidContentsPreferredSizeChange(const gfx::Size& new_size); + void OnDidChangeScrollbarsForMainFrame(bool has_horizontal_scrollbar, + bool has_vertical_scrollbar); + void OnDidChangeScrollOffsetPinningForMainFrame(bool is_pinned_to_left, + bool is_pinned_to_right); + void OnDidChangeNumWheelEvents(int count); + void OnSelectionChanged(const string16& text, + size_t offset, + const ui::Range& range); + void OnSelectionBoundsChanged(const gfx::Rect& start_rect, + WebKit::WebTextDirection start_direction, + const gfx::Rect& end_rect, + WebKit::WebTextDirection end_direction); + void OnPasteFromSelectionClipboard(); + void OnRouteCloseEvent(); + void OnRouteMessageEvent(const ViewMsg_PostMessage_Params& params); + void OnRunJavaScriptMessage(const string16& message, + const string16& default_prompt, + const GURL& frame_url, + JavaScriptMessageType type, + IPC::Message* reply_msg); + void OnRunBeforeUnloadConfirm(const GURL& frame_url, + const string16& message, + bool is_reload, + IPC::Message* reply_msg); + void OnStartDragging(const WebDropData& drop_data, + WebKit::WebDragOperationsMask operations_allowed, + const SkBitmap& bitmap, + const gfx::Vector2d& bitmap_offset_in_dip, + const DragEventSourceInfo& event_info); void OnUpdateDragCursor(WebKit::WebDragOperation drag_operation); void OnTargetDropACK(); void OnTakeFocus(bool reverse); @@ -549,11 +548,11 @@ class CONTENT_EXPORT RenderViewHostImpl const string16& source_id); void OnUpdateInspectorSetting(const std::string& key, const std::string& value); - void OnMsgShouldCloseACK( + void OnShouldCloseACK( bool proceed, const base::TimeTicks& renderer_before_unload_start_time, const base::TimeTicks& renderer_before_unload_end_time); - void OnMsgClosePageACK(); + void OnClosePageACK(); void OnAccessibilityNotifications( const std::vector<AccessibilityHostMsg_NotificationParams>& params); void OnScriptEvalResponse(int id, const base::ListValue& result); @@ -574,11 +573,11 @@ class CONTENT_EXPORT RenderViewHostImpl void OnGetWindowSnapshot(const int snapshot_id); #if defined(OS_MACOSX) || defined(OS_ANDROID) - void OnMsgShowPopup(const ViewHostMsg_ShowPopup_Params& params); + void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); #endif #if defined(OS_ANDROID) - void OnMsgDidChangeBodyBackgroundColor(SkColor color); + void OnDidChangeBodyBackgroundColor(SkColor color); void OnStartContentIntent(const GURL& content_url); #endif diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index b7d5544..1feaa74 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -23,7 +23,7 @@ class RenderViewHostTest : public RenderViewHostImplTestHarness { }; // All about URLs reported by the renderer should get rewritten to about:blank. -// See RenderViewHost::OnMsgNavigate for a discussion. +// See RenderViewHost::OnNavigate for a discussion. TEST_F(RenderViewHostTest, FilterAbout) { test_rvh()->SendNavigate(1, GURL("about:cache")); ASSERT_TRUE(controller().GetActiveEntry()); @@ -127,28 +127,28 @@ TEST_F(RenderViewHostTest, StartDragging) { GURL file_url = GURL("file:///home/user/secrets.txt"); drop_data.url = file_url; drop_data.html_base_url = file_url; - test_rvh()->TestOnMsgStartDragging(drop_data); + test_rvh()->TestOnStartDragging(drop_data); EXPECT_EQ(GURL("about:blank"), delegate_view.drag_url()); EXPECT_EQ(GURL("about:blank"), delegate_view.html_base_url()); GURL http_url = GURL("http://www.domain.com/index.html"); drop_data.url = http_url; drop_data.html_base_url = http_url; - test_rvh()->TestOnMsgStartDragging(drop_data); + test_rvh()->TestOnStartDragging(drop_data); EXPECT_EQ(http_url, delegate_view.drag_url()); EXPECT_EQ(http_url, delegate_view.html_base_url()); GURL https_url = GURL("https://www.domain.com/index.html"); drop_data.url = https_url; drop_data.html_base_url = https_url; - test_rvh()->TestOnMsgStartDragging(drop_data); + test_rvh()->TestOnStartDragging(drop_data); EXPECT_EQ(https_url, delegate_view.drag_url()); EXPECT_EQ(https_url, delegate_view.html_base_url()); GURL javascript_url = GURL("javascript:alert('I am a bookmarklet')"); drop_data.url = javascript_url; drop_data.html_base_url = http_url; - test_rvh()->TestOnMsgStartDragging(drop_data); + test_rvh()->TestOnStartDragging(drop_data); EXPECT_EQ(javascript_url, delegate_view.drag_url()); EXPECT_EQ(http_url, delegate_view.html_base_url()); } @@ -211,13 +211,13 @@ TEST_F(RenderViewHostTest, BadMessageHandlerRenderWidgetHost) { EXPECT_EQ(1, process()->bad_msg_count()); } -// Test that OnMsgInputEventAck() detects bad messages. +// Test that OnInputEventAck() detects bad messages. TEST_F(RenderViewHostTest, BadMessageHandlerInputEventAck) { EXPECT_EQ(0, process()->bad_msg_count()); // ViewHostMsg_HandleInputEvent_ACK is defined taking 0 params but // the code actually expects it to have at least one int para, this this // bogus message will not fail at de-serialization but should fail in - // OnMsgInputEventAck() processing. + // OnInputEventAck() processing. IPC::Message message(0, ViewHostMsg_HandleInputEvent_ACK::ID, IPC::Message::PRIORITY_NORMAL); test_rvh()->OnMessageReceived(message); diff --git a/content/browser/renderer_host/render_widget_host_gtk.cc b/content/browser/renderer_host/render_widget_host_gtk.cc index 61a46d7..2a78bc7 100644 --- a/content/browser/renderer_host/render_widget_host_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_gtk.cc @@ -8,7 +8,7 @@ namespace content { -void RenderWidgetHostImpl::OnMsgCreatePluginContainer( +void RenderWidgetHostImpl::OnCreatePluginContainer( gfx::PluginWindowHandle id) { // TODO(piman): view_ can only be NULL with delayed view creation in // extensions (see ExtensionHost::CreateRenderViewSoon). Figure out how to @@ -20,7 +20,7 @@ void RenderWidgetHostImpl::OnMsgCreatePluginContainer( } } -void RenderWidgetHostImpl::OnMsgDestroyPluginContainer( +void RenderWidgetHostImpl::OnDestroyPluginContainer( gfx::PluginWindowHandle id) { if (view_) { view_->DestroyPluginContainer(id); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 363f09f..be9a489 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -323,45 +323,42 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) { bool handled = true; bool msg_is_ok = true; IPC_BEGIN_MESSAGE_MAP_EX(RenderWidgetHostImpl, msg, msg_is_ok) - IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnMsgRenderViewReady) - IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewGone, OnMsgRenderViewGone) - IPC_MESSAGE_HANDLER(ViewHostMsg_Close, OnMsgClose) + IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady) + IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewGone, OnRenderViewGone) + IPC_MESSAGE_HANDLER(ViewHostMsg_Close, OnClose) IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateScreenRects_ACK, - OnMsgUpdateScreenRectsAck) - IPC_MESSAGE_HANDLER(ViewHostMsg_RequestMove, OnMsgRequestMove) - IPC_MESSAGE_HANDLER(ViewHostMsg_SetTooltipText, OnMsgSetTooltipText) - IPC_MESSAGE_HANDLER(ViewHostMsg_PaintAtSize_ACK, OnMsgPaintAtSizeAck) + OnUpdateScreenRectsAck) + IPC_MESSAGE_HANDLER(ViewHostMsg_RequestMove, OnRequestMove) + IPC_MESSAGE_HANDLER(ViewHostMsg_SetTooltipText, OnSetTooltipText) + IPC_MESSAGE_HANDLER(ViewHostMsg_PaintAtSize_ACK, OnPaintAtSizeAck) IPC_MESSAGE_HANDLER(ViewHostMsg_CompositorSurfaceBuffersSwapped, OnCompositorSurfaceBuffersSwapped) - IPC_MESSAGE_HANDLER(ViewHostMsg_SwapCompositorFrame, - OnMsgSwapCompositorFrame) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnMsgUpdateRect) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateIsDelayed, OnMsgUpdateIsDelayed) - IPC_MESSAGE_HANDLER(ViewHostMsg_HandleInputEvent_ACK, OnMsgInputEventAck) - IPC_MESSAGE_HANDLER(ViewHostMsg_BeginSmoothScroll, OnMsgBeginSmoothScroll) - IPC_MESSAGE_HANDLER(ViewHostMsg_SelectRange_ACK, OnMsgSelectRangeAck) - IPC_MESSAGE_HANDLER(ViewHostMsg_Focus, OnMsgFocus) - IPC_MESSAGE_HANDLER(ViewHostMsg_Blur, OnMsgBlur) + IPC_MESSAGE_HANDLER(ViewHostMsg_SwapCompositorFrame, OnSwapCompositorFrame) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateIsDelayed, OnUpdateIsDelayed) + IPC_MESSAGE_HANDLER(ViewHostMsg_HandleInputEvent_ACK, OnInputEventAck) + IPC_MESSAGE_HANDLER(ViewHostMsg_BeginSmoothScroll, OnBeginSmoothScroll) + IPC_MESSAGE_HANDLER(ViewHostMsg_SelectRange_ACK, OnSelectRangeAck) + IPC_MESSAGE_HANDLER(ViewHostMsg_Focus, OnFocus) + IPC_MESSAGE_HANDLER(ViewHostMsg_Blur, OnBlur) IPC_MESSAGE_HANDLER(ViewHostMsg_HasTouchEventHandlers, - OnMsgHasTouchEventHandlers) - IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnMsgSetCursor) + OnHasTouchEventHandlers) + IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnSetCursor) IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged, - OnMsgTextInputStateChanged) + OnTextInputStateChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCompositionRangeChanged, - OnMsgImeCompositionRangeChanged) + OnImeCompositionRangeChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCancelComposition, - OnMsgImeCancelComposition) + OnImeCancelComposition) IPC_MESSAGE_HANDLER(ViewHostMsg_DidActivateAcceleratedCompositing, - OnMsgDidActivateAcceleratedCompositing) - IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnMsgLockMouse) - IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnMsgUnlockMouse) + OnDidActivateAcceleratedCompositing) + IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse) + IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnUnlockMouse) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowDisambiguationPopup, - OnMsgShowDisambiguationPopup) + OnShowDisambiguationPopup) #if defined(OS_MACOSX) - IPC_MESSAGE_HANDLER(ViewHostMsg_PluginFocusChanged, - OnMsgPluginFocusChanged) - IPC_MESSAGE_HANDLER(ViewHostMsg_StartPluginIme, - OnMsgStartPluginIme) + IPC_MESSAGE_HANDLER(ViewHostMsg_PluginFocusChanged, OnPluginFocusChanged) + IPC_MESSAGE_HANDLER(ViewHostMsg_StartPluginIme, OnStartPluginIme) IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateFakePluginWindowHandle, OnAllocateFakePluginWindowHandle) IPC_MESSAGE_HANDLER(ViewHostMsg_DestroyFakePluginWindowHandle, @@ -374,14 +371,13 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) { OnAcceleratedSurfaceBuffersSwapped) #endif #if defined(OS_ANDROID) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFrameInfo, - OnMsgUpdateFrameInfo) + IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFrameInfo, OnUpdateFrameInfo) #endif #if defined(TOOLKIT_GTK) IPC_MESSAGE_HANDLER(ViewHostMsg_CreatePluginContainer, - OnMsgCreatePluginContainer) + OnCreatePluginContainer) IPC_MESSAGE_HANDLER(ViewHostMsg_DestroyPluginContainer, - OnMsgDestroyPluginContainer) + OnDestroyPluginContainer) #endif #if defined(OS_WIN) IPC_MESSAGE_HANDLER(ViewHostMsg_WindowlessPluginDummyWindowCreated, @@ -460,7 +456,7 @@ void RenderWidgetHostImpl::WasShown() { // 1. WasResized -> Send ViewMsg_Resize to render // 2. WasResized -> do nothing as resize_ack_pending_ is true // 3. WasHidden - // 4. OnMsgUpdateRect from (1) processed. Does NOT invoke WasResized as view + // 4. OnUpdateRect from (1) processed. Does NOT invoke WasResized as view // is hidden. Now renderer/browser out of sync with what they think size // is. // By invoking WasResized the renderer is updated as necessary. WasResized @@ -1407,23 +1403,23 @@ void RenderWidgetHostImpl::RendererIsResponsive() { } } -void RenderWidgetHostImpl::OnMsgRenderViewReady() { +void RenderWidgetHostImpl::OnRenderViewReady() { SendScreenRects(); WasResized(); } -void RenderWidgetHostImpl::OnMsgRenderViewGone(int status, int exit_code) { +void RenderWidgetHostImpl::OnRenderViewGone(int status, int exit_code) { // TODO(evanm): This synchronously ends up calling "delete this". // Is that really what we want in response to this message? I'm matching // previous behavior of the code here. Destroy(); } -void RenderWidgetHostImpl::OnMsgClose() { +void RenderWidgetHostImpl::OnClose() { Shutdown(); } -void RenderWidgetHostImpl::OnMsgSetTooltipText( +void RenderWidgetHostImpl::OnSetTooltipText( const string16& tooltip_text, WebTextDirection text_direction_hint) { // First, add directionality marks around tooltip text if necessary. @@ -1455,7 +1451,7 @@ void RenderWidgetHostImpl::OnMsgSetTooltipText( view_->SetTooltipText(wrapped_tooltip_text); } -void RenderWidgetHostImpl::OnMsgUpdateScreenRectsAck() { +void RenderWidgetHostImpl::OnUpdateScreenRectsAck() { waiting_for_screen_rects_ack_ = false; if (!view_) return; @@ -1468,7 +1464,7 @@ void RenderWidgetHostImpl::OnMsgUpdateScreenRectsAck() { SendScreenRects(); } -void RenderWidgetHostImpl::OnMsgRequestMove(const gfx::Rect& pos) { +void RenderWidgetHostImpl::OnRequestMove(const gfx::Rect& pos) { // Note that we ignore the position. if (view_) { view_->SetBounds(pos); @@ -1476,7 +1472,7 @@ void RenderWidgetHostImpl::OnMsgRequestMove(const gfx::Rect& pos) { } } -void RenderWidgetHostImpl::OnMsgPaintAtSizeAck(int tag, const gfx::Size& size) { +void RenderWidgetHostImpl::OnPaintAtSizeAck(int tag, const gfx::Size& size) { std::pair<int, gfx::Size> details = std::make_pair(tag, size); NotificationService::current()->Notify( NOTIFICATION_RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK, @@ -1515,7 +1511,7 @@ void RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwapped( gpu_process_host_id); } -void RenderWidgetHostImpl::OnMsgSwapCompositorFrame( +void RenderWidgetHostImpl::OnSwapCompositorFrame( const cc::CompositorFrame& frame) { #if defined(OS_ANDROID) gfx::Vector2dF scroll_offset = ScaleVector2d( @@ -1534,9 +1530,9 @@ void RenderWidgetHostImpl::OnMsgSwapCompositorFrame( #endif } -void RenderWidgetHostImpl::OnMsgUpdateRect( +void RenderWidgetHostImpl::OnUpdateRect( const ViewHostMsg_UpdateRect_Params& params) { - TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnMsgUpdateRect"); + TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); TimeTicks paint_start = TimeTicks::Now(); // Update our knowledge of the RenderWidget's size. @@ -1631,7 +1627,7 @@ void RenderWidgetHostImpl::OnMsgUpdateRect( UMA_HISTOGRAM_TIMES("MPArch.RWH_OnMsgUpdateRect", delta); } -void RenderWidgetHostImpl::OnMsgUpdateIsDelayed() { +void RenderWidgetHostImpl::OnUpdateIsDelayed() { if (in_get_backing_store_) abort_get_backing_store_ = true; } @@ -1701,9 +1697,9 @@ void RenderWidgetHostImpl::DidUpdateBackingStore( "x+y", params.bitmap_rect.x() + params.bitmap_rect.y()); } -void RenderWidgetHostImpl::OnMsgInputEventAck( +void RenderWidgetHostImpl::OnInputEventAck( WebInputEvent::Type event_type, InputEventAckState ack_result) { - TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnMsgInputEventAck"); + TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnInputEventAck"); bool processed = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED); if (!in_process_event_types_.empty() && @@ -1752,7 +1748,7 @@ void RenderWidgetHostImpl::OnMsgInputEventAck( // source object. On linux, specifying // Source<RenderWidgetHost> results in a very strange // runtime error in the epilogue of the enclosing - // (OnMsgInputEventAck) method, but not on other platforms; using + // (OnInputEventAck) method, but not on other platforms; using // 'void' instead is just as safe (since NotificationSource // is not actually typesafe) and avoids this error. NotificationService::current()->Notify( @@ -1761,7 +1757,7 @@ void RenderWidgetHostImpl::OnMsgInputEventAck( Details<int>(&type)); } -void RenderWidgetHostImpl::OnMsgBeginSmoothScroll( +void RenderWidgetHostImpl::OnBeginSmoothScroll( int gesture_id, const ViewHostMsg_BeginSmoothScroll_Params ¶ms) { if (!view_) return; @@ -1847,7 +1843,7 @@ void RenderWidgetHostImpl::TickActiveSmoothScrollGesture() { preferred_interval); } -void RenderWidgetHostImpl::OnMsgSelectRangeAck() { +void RenderWidgetHostImpl::OnSelectRangeAck() { select_range_pending_ = false; if (next_selection_range_.get()) { scoped_ptr<SelectionRange> next(next_selection_range_.Pass()); @@ -1885,19 +1881,19 @@ void RenderWidgetHostImpl::ProcessTouchAck(InputEventAckState ack_result) { touch_event_queue_->ProcessTouchAck(ack_result); } -void RenderWidgetHostImpl::OnMsgFocus() { +void RenderWidgetHostImpl::OnFocus() { // Only RenderViewHost can deal with that message. RecordAction(UserMetricsAction("BadMessageTerminate_RWH4")); GetProcess()->ReceivedBadMessage(); } -void RenderWidgetHostImpl::OnMsgBlur() { +void RenderWidgetHostImpl::OnBlur() { // Only RenderViewHost can deal with that message. RecordAction(UserMetricsAction("BadMessageTerminate_RWH5")); GetProcess()->ReceivedBadMessage(); } -void RenderWidgetHostImpl::OnMsgHasTouchEventHandlers(bool has_handlers) { +void RenderWidgetHostImpl::OnHasTouchEventHandlers(bool has_handlers) { if (has_touch_handler_ == has_handlers) return; has_touch_handler_ = has_handlers; @@ -1909,44 +1905,44 @@ void RenderWidgetHostImpl::OnMsgHasTouchEventHandlers(bool has_handlers) { #endif } -void RenderWidgetHostImpl::OnMsgSetCursor(const WebCursor& cursor) { +void RenderWidgetHostImpl::OnSetCursor(const WebCursor& cursor) { if (!view_) { return; } view_->UpdateCursor(cursor); } -void RenderWidgetHostImpl::OnMsgTextInputStateChanged( +void RenderWidgetHostImpl::OnTextInputStateChanged( const ViewHostMsg_TextInputState_Params& params) { if (view_) view_->TextInputStateChanged(params); } -void RenderWidgetHostImpl::OnMsgImeCompositionRangeChanged( +void RenderWidgetHostImpl::OnImeCompositionRangeChanged( const ui::Range& range, const std::vector<gfx::Rect>& character_bounds) { if (view_) view_->ImeCompositionRangeChanged(range, character_bounds); } -void RenderWidgetHostImpl::OnMsgImeCancelComposition() { +void RenderWidgetHostImpl::OnImeCancelComposition() { if (view_) view_->ImeCancelComposition(); } -void RenderWidgetHostImpl::OnMsgDidActivateAcceleratedCompositing( +void RenderWidgetHostImpl::OnDidActivateAcceleratedCompositing( bool activated) { TRACE_EVENT1("renderer_host", - "RenderWidgetHostImpl::OnMsgDidActivateAcceleratedCompositing", + "RenderWidgetHostImpl::OnDidActivateAcceleratedCompositing", "activated", activated); is_accelerated_compositing_active_ = activated; if (view_) view_->OnAcceleratedCompositingStateChange(); } -void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture, - bool last_unlocked_by_target, - bool privileged) { +void RenderWidgetHostImpl::OnLockMouse(bool user_gesture, + bool last_unlocked_by_target, + bool privileged) { if (pending_mouse_lock_request_) { Send(new ViewMsg_LockMouse_ACK(routing_id_, false)); @@ -1965,11 +1961,11 @@ void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture, } } -void RenderWidgetHostImpl::OnMsgUnlockMouse() { +void RenderWidgetHostImpl::OnUnlockMouse() { RejectMouseLockOrUnlockIfNecessary(); } -void RenderWidgetHostImpl::OnMsgShowDisambiguationPopup( +void RenderWidgetHostImpl::OnShowDisambiguationPopup( const gfx::Rect& rect, const gfx::Size& size, const TransportDIB::Id& id) { diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index 5ec355a..7549ac2 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -543,54 +543,50 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, void RendererIsResponsive(); // IPC message handlers - void OnMsgRenderViewReady(); - void OnMsgRenderViewGone(int status, int error_code); - void OnMsgClose(); - void OnMsgUpdateScreenRectsAck(); - void OnMsgRequestMove(const gfx::Rect& pos); - void OnMsgSetTooltipText(const string16& tooltip_text, - WebKit::WebTextDirection text_direction_hint); - void OnMsgPaintAtSizeAck(int tag, const gfx::Size& size); + void OnRenderViewReady(); + void OnRenderViewGone(int status, int error_code); + void OnClose(); + void OnUpdateScreenRectsAck(); + void OnRequestMove(const gfx::Rect& pos); + void OnSetTooltipText(const string16& tooltip_text, + WebKit::WebTextDirection text_direction_hint); + void OnPaintAtSizeAck(int tag, const gfx::Size& size); void OnCompositorSurfaceBuffersSwapped(int32 surface_id, uint64 surface_handle, int32 route_id, const gfx::Size& size, int32 gpu_process_host_id); - void OnMsgSwapCompositorFrame(const cc::CompositorFrame& frame); - void OnMsgUpdateRect(const ViewHostMsg_UpdateRect_Params& params); - void OnMsgUpdateIsDelayed(); - void OnMsgInputEventAck(WebKit::WebInputEvent::Type event_type, - InputEventAckState ack_result); - void OnMsgBeginSmoothScroll( + void OnSwapCompositorFrame(const cc::CompositorFrame& frame); + void OnUpdateRect(const ViewHostMsg_UpdateRect_Params& params); + void OnUpdateIsDelayed(); + void OnInputEventAck(WebKit::WebInputEvent::Type event_type, + InputEventAckState ack_result); + void OnBeginSmoothScroll( int gesture_id, const ViewHostMsg_BeginSmoothScroll_Params ¶ms); - void OnMsgSelectRangeAck(); - virtual void OnMsgFocus(); - virtual void OnMsgBlur(); - void OnMsgHasTouchEventHandlers(bool has_handlers); - - void OnMsgSetCursor(const WebCursor& cursor); - void OnMsgTextInputStateChanged( + void OnSelectRangeAck(); + virtual void OnFocus(); + virtual void OnBlur(); + void OnHasTouchEventHandlers(bool has_handlers); + void OnSetCursor(const WebCursor& cursor); + void OnTextInputStateChanged( const ViewHostMsg_TextInputState_Params& params); - void OnMsgImeCompositionRangeChanged( + void OnImeCompositionRangeChanged( const ui::Range& range, const std::vector<gfx::Rect>& character_bounds); - void OnMsgImeCancelComposition(); - - void OnMsgDidActivateAcceleratedCompositing(bool activated); - - void OnMsgLockMouse(bool user_gesture, - bool last_unlocked_by_target, - bool privileged); - void OnMsgUnlockMouse(); - - void OnMsgShowDisambiguationPopup(const gfx::Rect& rect, - const gfx::Size& size, - const TransportDIB::Id& id); + void OnImeCancelComposition(); + void OnDidActivateAcceleratedCompositing(bool activated); + void OnLockMouse(bool user_gesture, + bool last_unlocked_by_target, + bool privileged); + void OnUnlockMouse(); + void OnShowDisambiguationPopup(const gfx::Rect& rect, + const gfx::Size& size, + const TransportDIB::Id& id); #if defined(OS_MACOSX) - void OnMsgPluginFocusChanged(bool focused, int plugin_id); - void OnMsgStartPluginIme(); + void OnPluginFocusChanged(bool focused, int plugin_id); + void OnStartPluginIme(); void OnAllocateFakePluginWindowHandle(bool opaque, bool root, gfx::PluginWindowHandle* id); @@ -607,15 +603,15 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, uint64 surface_handle); #endif #if defined(OS_ANDROID) - void OnMsgUpdateFrameInfo(const gfx::Vector2d& scroll_offset, - float page_scale_factor, - float min_page_scale_factor, - float max_page_scale_factor, - const gfx::Size& content_size); + void OnUpdateFrameInfo(const gfx::Vector2d& scroll_offset, + float page_scale_factor, + float min_page_scale_factor, + float max_page_scale_factor, + const gfx::Size& content_size); #endif #if defined(TOOLKIT_GTK) - void OnMsgCreatePluginContainer(gfx::PluginWindowHandle id); - void OnMsgDestroyPluginContainer(gfx::PluginWindowHandle id); + void OnCreatePluginContainer(gfx::PluginWindowHandle id); + void OnDestroyPluginContainer(gfx::PluginWindowHandle id); #endif #if defined(OS_WIN) void OnWindowlessPluginDummyWindowCreated( @@ -648,22 +644,22 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, const gfx::Rect& clip_rect, const gfx::Size& view_size); - // Called by OnMsgInputEventAck() to process a keyboard event ack message. + // Called by OnInputEventAck() to process a keyboard event ack message. void ProcessKeyboardEventAck(int type, bool processed); - // Called by OnMsgInputEventAck() to process a wheel event ack message. + // Called by OnInputEventAck() to process a wheel event ack message. // This could result in a task being posted to allow additional wheel // input messages to be coalesced. void ProcessWheelAck(bool processed); - // Called by OnMsgInputEventAck() to process a gesture event ack message. + // Called by OnInputEventAck() to process a gesture event ack message. // This validates the gesture for suppression of touchpad taps and sends one // previously queued coalesced gesture if it exists. void ProcessGestureAck(bool processed, int type); void SimulateTouchGestureWithMouse(const WebKit::WebMouseEvent& mouse_event); - // Called on OnMsgInputEventAck() to process a touch event ack message. + // Called on OnInputEventAck() to process a touch event ack message. // This can result in a gesture event being generated and sent back to the // renderer. void ProcessTouchAck(InputEventAckState ack_result); @@ -673,7 +669,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, void DelayedAutoResized(); // Called periodically to advance the active scroll gesture after being - // initiated by OnMsgBeginSmoothScroll. + // initiated by OnBeginSmoothScroll. void TickActiveSmoothScrollGesture(); // Our delegate, which wants to know mainly about keyboard events. diff --git a/content/browser/renderer_host/render_widget_host_impl_android.cc b/content/browser/renderer_host/render_widget_host_impl_android.cc index 9896307..92f8477 100644 --- a/content/browser/renderer_host/render_widget_host_impl_android.cc +++ b/content/browser/renderer_host/render_widget_host_impl_android.cc @@ -7,7 +7,7 @@ namespace content { -void RenderWidgetHostImpl::OnMsgUpdateFrameInfo( +void RenderWidgetHostImpl::OnUpdateFrameInfo( const gfx::Vector2d& scroll_offset, float page_scale_factor, float min_page_scale_factor, diff --git a/content/browser/renderer_host/render_widget_host_mac.cc b/content/browser/renderer_host/render_widget_host_mac.cc index b109fbb..8cd9e55 100644 --- a/content/browser/renderer_host/render_widget_host_mac.cc +++ b/content/browser/renderer_host/render_widget_host_mac.cc @@ -8,13 +8,12 @@ namespace content { -void RenderWidgetHostImpl::OnMsgPluginFocusChanged(bool focused, - int plugin_id) { +void RenderWidgetHostImpl::OnPluginFocusChanged(bool focused, int plugin_id) { if (view_) view_->PluginFocusChanged(focused, plugin_id); } -void RenderWidgetHostImpl::OnMsgStartPluginIme() { +void RenderWidgetHostImpl::OnStartPluginIme() { if (view_) view_->StartPluginIme(); } @@ -23,7 +22,7 @@ void RenderWidgetHostImpl::OnAllocateFakePluginWindowHandle( bool opaque, bool root, gfx::PluginWindowHandle* id) { - // TODO(kbr): similar potential issue here as in OnMsgCreatePluginContainer. + // TODO(kbr): similar potential issue here as in OnCreatePluginContainer. // Possibly less of an issue because this is only used for the GPU plugin. if (view_) { *id = view_->AllocateFakePluginWindowHandle(opaque, root); diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index aada5d7..d425dfe 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -108,8 +108,8 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl { } // Allow poking at a few private members. - using RenderWidgetHostImpl::OnMsgPaintAtSizeAck; - using RenderWidgetHostImpl::OnMsgUpdateRect; + using RenderWidgetHostImpl::OnPaintAtSizeAck; + using RenderWidgetHostImpl::OnUpdateRect; using RenderWidgetHostImpl::RendererExited; using RenderWidgetHostImpl::in_flight_size_; using RenderWidgetHostImpl::is_hidden_; @@ -702,7 +702,7 @@ TEST_F(RenderWidgetHostTest, Resize) { // resize ack pending flag. ViewHostMsg_UpdateRect_Params params; process_->InitUpdateRectParams(¶ms); - host_->OnMsgUpdateRect(params); + host_->OnUpdateRect(params); EXPECT_TRUE(host_->resize_ack_pending_); EXPECT_EQ(original_size.size(), host_->in_flight_size_); @@ -722,7 +722,7 @@ TEST_F(RenderWidgetHostTest, Resize) { process_->sink().ClearMessages(); params.flags = ViewHostMsg_UpdateRect_Flags::IS_RESIZE_ACK; params.view_size = original_size.size(); - host_->OnMsgUpdateRect(params); + host_->OnUpdateRect(params); EXPECT_TRUE(host_->resize_ack_pending_); EXPECT_EQ(second_size.size(), host_->in_flight_size_); ASSERT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID)); @@ -730,7 +730,7 @@ TEST_F(RenderWidgetHostTest, Resize) { // Send the resize ack for the latest size. process_->sink().ClearMessages(); params.view_size = second_size.size(); - host_->OnMsgUpdateRect(params); + host_->OnUpdateRect(params); EXPECT_FALSE(host_->resize_ack_pending_); EXPECT_EQ(gfx::Size(), host_->in_flight_size_); ASSERT_FALSE(process_->sink().GetFirstMessageMatching(ViewMsg_Resize::ID)); @@ -934,7 +934,7 @@ TEST_F(RenderWidgetHostTest, HiddenPaint) { process_->sink().ClearMessages(); ViewHostMsg_UpdateRect_Params params; process_->InitUpdateRectParams(¶ms); - host_->OnMsgUpdateRect(params); + host_->OnUpdateRect(params); // It should have sent out the ACK. EXPECT_TRUE(process_->sink().GetUniqueMessageMatching( @@ -968,7 +968,7 @@ TEST_F(RenderWidgetHostTest, PaintAtSize) { NOTIFICATION_RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK, Source<RenderWidgetHost>(host_.get())); - host_->OnMsgPaintAtSizeAck(kPaintAtSizeTag, gfx::Size(20, 30)); + host_->OnPaintAtSizeAck(kPaintAtSizeTag, gfx::Size(20, 30)); EXPECT_EQ(host_.get(), observer.host()); EXPECT_EQ(kPaintAtSizeTag, observer.tag()); EXPECT_EQ(20, observer.size().width()); @@ -2658,7 +2658,7 @@ TEST_F(RenderWidgetHostTest, IncorrectBitmapScaleFactor) { params.scale_factor = params.scale_factor * 2; EXPECT_EQ(0, process_->bad_msg_count()); - host_->OnMsgUpdateRect(params); + host_->OnUpdateRect(params); EXPECT_EQ(1, process_->bad_msg_count()); } #endif diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 9f4787e..c550522 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -200,7 +200,7 @@ void RenderWidgetHostViewAndroid::MovePluginWindows( const gfx::Vector2d& scroll_offset, const std::vector<webkit::npapi::WebPluginGeometry>& moves) { // We don't have plugin windows on Android. Do nothing. Note: this is called - // from RenderWidgetHost::OnMsgUpdateRect which is itself invoked while + // from RenderWidgetHost::OnUpdateRect which is itself invoked while // processing the corresponding message from Renderer. } diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index f87b832..6bea59f 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -288,13 +288,13 @@ void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { void TestRenderViewHost::SendNavigateWithTransition( int page_id, const GURL& url, PageTransition transition) { - OnMsgDidStartProvisionalLoadForFrame(0, -1, true, url); + OnDidStartProvisionalLoadForFrame(0, -1, true, url); SendNavigateWithParameters(page_id, url, transition, url); } void TestRenderViewHost::SendNavigateWithOriginalRequestURL( int page_id, const GURL& url, const GURL& original_request_url) { - OnMsgDidStartProvisionalLoadForFrame(0, -1, true, url); + OnDidStartProvisionalLoadForFrame(0, -1, true, url); SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, original_request_url); } @@ -327,11 +327,11 @@ void TestRenderViewHost::SendNavigateWithParameters( params.original_request_url = original_request_url; ViewHostMsg_FrameNavigate msg(1, params); - OnMsgNavigate(msg); + OnNavigate(msg); } void TestRenderViewHost::SendShouldCloseACK(bool proceed) { - OnMsgShouldCloseACK(proceed, base::TimeTicks(), base::TimeTicks()); + OnShouldCloseACK(proceed, base::TimeTicks(), base::TimeTicks()); } void TestRenderViewHost::SetContentsMimeType(const std::string& mime_type) { @@ -350,12 +350,12 @@ void TestRenderViewHost::SimulateWasShown() { WasShown(); } -void TestRenderViewHost::TestOnMsgStartDragging( +void TestRenderViewHost::TestOnStartDragging( const WebDropData& drop_data) { WebKit::WebDragOperationsMask drag_operation = WebKit::WebDragOperationEvery; DragEventSourceInfo event_info; - OnMsgStartDragging(drop_data, drag_operation, SkBitmap(), gfx::Vector2d(), - event_info); + OnStartDragging(drop_data, drag_operation, SkBitmap(), gfx::Vector2d(), + event_info); } void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) { diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index d65f897..90d4866 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -250,21 +250,21 @@ class TestRenderViewHost virtual void SimulateWasHidden() OVERRIDE; virtual void SimulateWasShown() OVERRIDE; - // Calls OnMsgNavigate on the RenderViewHost with the given information, + // Calls OnNavigate on the RenderViewHost with the given information, // including a custom original request URL. Sets the rest of the // parameters in the message to the "typical" values. This is a helper // function for simulating the most common types of loads. void SendNavigateWithOriginalRequestURL( int page_id, const GURL& url, const GURL& original_request_url); - // Calls OnMsgNavigate on the RenderViewHost with the given information. + // Calls OnNavigate on the RenderViewHost with the given information. // Sets the rest of the parameters in the message to the "typical" values. // This is a helper function for simulating the most common types of loads. void SendNavigateWithParameters( int page_id, const GURL& url, PageTransition transition, const GURL& original_request_url); - void TestOnMsgStartDragging(const WebDropData& drop_data); + void TestOnStartDragging(const WebDropData& drop_data); // If set, *delete_counter is incremented when this object destructs. void set_delete_counter(int* delete_counter) { diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc index 3163b32..8a4f24a 100644 --- a/content/ppapi_plugin/broker_process_dispatcher.cc +++ b/content/ppapi_plugin/broker_process_dispatcher.cc @@ -114,15 +114,13 @@ BrokerProcessDispatcher::~BrokerProcessDispatcher() { bool BrokerProcessDispatcher::OnMessageReceived(const IPC::Message& msg) { IPC_BEGIN_MESSAGE_MAP(BrokerProcessDispatcher, msg) - IPC_MESSAGE_HANDLER(PpapiMsg_GetSitesWithData, OnMsgGetSitesWithData) - IPC_MESSAGE_HANDLER(PpapiMsg_ClearSiteData, OnMsgClearSiteData) + IPC_MESSAGE_HANDLER(PpapiMsg_GetSitesWithData, OnGetSitesWithData) + IPC_MESSAGE_HANDLER(PpapiMsg_ClearSiteData, OnClearSiteData) IPC_MESSAGE_HANDLER(PpapiMsg_DeauthorizeContentLicenses, - OnMsgDeauthorizeContentLicenses) - IPC_MESSAGE_HANDLER(PpapiMsg_GetPermissionSettings, - OnMsgGetPermissionSettings) - IPC_MESSAGE_HANDLER(PpapiMsg_SetDefaultPermission, - OnMsgSetDefaultPermission) - IPC_MESSAGE_HANDLER(PpapiMsg_SetSitePermission, OnMsgSetSitePermission) + OnDeauthorizeContentLicenses) + IPC_MESSAGE_HANDLER(PpapiMsg_GetPermissionSettings, OnGetPermissionSettings) + IPC_MESSAGE_HANDLER(PpapiMsg_SetDefaultPermission, OnSetDefaultPermission) + IPC_MESSAGE_HANDLER(PpapiMsg_SetSitePermission, OnSetSitePermission) IPC_MESSAGE_UNHANDLED(return BrokerSideDispatcher::OnMessageReceived(msg)) IPC_END_MESSAGE_MAP() return true; @@ -137,7 +135,7 @@ void BrokerProcessDispatcher::OnGetPermissionSettingsCompleted( request_id, success, default_permission, sites)); } -void BrokerProcessDispatcher::OnMsgGetSitesWithData( +void BrokerProcessDispatcher::OnGetSitesWithData( uint32 request_id, const FilePath& plugin_data_path) { std::vector<std::string> sites; @@ -145,7 +143,7 @@ void BrokerProcessDispatcher::OnMsgGetSitesWithData( Send(new PpapiHostMsg_GetSitesWithDataResult(request_id, sites)); } -void BrokerProcessDispatcher::OnMsgClearSiteData( +void BrokerProcessDispatcher::OnClearSiteData( uint32 request_id, const FilePath& plugin_data_path, const std::string& site, @@ -155,14 +153,14 @@ void BrokerProcessDispatcher::OnMsgClearSiteData( request_id, ClearSiteData(plugin_data_path, site, flags, max_age))); } -void BrokerProcessDispatcher::OnMsgDeauthorizeContentLicenses( +void BrokerProcessDispatcher::OnDeauthorizeContentLicenses( uint32 request_id, const FilePath& plugin_data_path) { Send(new PpapiHostMsg_DeauthorizeContentLicensesResult( request_id, DeauthorizeContentLicenses(plugin_data_path))); } -void BrokerProcessDispatcher::OnMsgGetPermissionSettings( +void BrokerProcessDispatcher::OnGetPermissionSettings( uint32 request_id, const FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type) { @@ -192,7 +190,7 @@ void BrokerProcessDispatcher::OnMsgGetPermissionSettings( return; } -void BrokerProcessDispatcher::OnMsgSetDefaultPermission( +void BrokerProcessDispatcher::OnSetDefaultPermission( uint32 request_id, const FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, @@ -204,7 +202,7 @@ void BrokerProcessDispatcher::OnMsgSetDefaultPermission( clear_site_specific))); } -void BrokerProcessDispatcher::OnMsgSetSitePermission( +void BrokerProcessDispatcher::OnSetSitePermission( uint32 request_id, const FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, diff --git a/content/ppapi_plugin/broker_process_dispatcher.h b/content/ppapi_plugin/broker_process_dispatcher.h index ae4853a..8200a7f 100644 --- a/content/ppapi_plugin/broker_process_dispatcher.h +++ b/content/ppapi_plugin/broker_process_dispatcher.h @@ -34,26 +34,26 @@ class BrokerProcessDispatcher const ppapi::FlashSiteSettings& sites); private: - void OnMsgGetSitesWithData(uint32 request_id, - const FilePath& plugin_data_path); - void OnMsgClearSiteData(uint32 request_id, - const FilePath& plugin_data_path, - const std::string& site, - uint64 flags, - uint64 max_age); - void OnMsgDeauthorizeContentLicenses(uint32 request_id, - const FilePath& plugin_data_path); - void OnMsgGetPermissionSettings( + void OnGetSitesWithData(uint32 request_id, + const FilePath& plugin_data_path); + void OnClearSiteData(uint32 request_id, + const FilePath& plugin_data_path, + const std::string& site, + uint64 flags, + uint64 max_age); + void OnDeauthorizeContentLicenses(uint32 request_id, + const FilePath& plugin_data_path); + void OnGetPermissionSettings( uint32 request_id, const FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type); - void OnMsgSetDefaultPermission( + void OnSetDefaultPermission( uint32 request_id, const FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific); - void OnMsgSetSitePermission( + void OnSetSitePermission( uint32 request_id, const FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 6f15ef2..0b67d9a 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -140,10 +140,10 @@ bool PpapiThread::Send(IPC::Message* msg) { bool PpapiThread::OnControlMessageReceived(const IPC::Message& msg) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PpapiThread, msg) - IPC_MESSAGE_HANDLER(PpapiMsg_LoadPlugin, OnMsgLoadPlugin) - IPC_MESSAGE_HANDLER(PpapiMsg_CreateChannel, OnMsgCreateChannel) - IPC_MESSAGE_HANDLER(PpapiMsg_SetNetworkState, OnMsgSetNetworkState) - IPC_MESSAGE_HANDLER(PpapiPluginMsg_ResourceReply, OnMsgResourceReply) + IPC_MESSAGE_HANDLER(PpapiMsg_LoadPlugin, OnLoadPlugin) + IPC_MESSAGE_HANDLER(PpapiMsg_CreateChannel, OnCreateChannel) + IPC_MESSAGE_HANDLER(PpapiMsg_SetNetworkState, OnSetNetworkState) + IPC_MESSAGE_HANDLER(PpapiPluginMsg_ResourceReply, OnResourceReply) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -226,8 +226,8 @@ void PpapiThread::Unregister(uint32 plugin_dispatcher_id) { plugin_dispatchers_.erase(plugin_dispatcher_id); } -void PpapiThread::OnMsgLoadPlugin(const FilePath& path, - const ppapi::PpapiPermissions& permissions) { +void PpapiThread::OnLoadPlugin(const FilePath& path, + const ppapi::PpapiPermissions& permissions) { SavePluginName(path); // This must be set before calling into the plugin so it can get the @@ -353,7 +353,7 @@ void PpapiThread::OnMsgLoadPlugin(const FilePath& path, library_.Reset(library.Release()); } -void PpapiThread::OnMsgCreateChannel(int renderer_id, bool incognito) { +void PpapiThread::OnCreateChannel(int renderer_id, bool incognito) { IPC::ChannelHandle channel_handle; if (!plugin_entry_points_.get_interface || // Plugin couldn't be loaded. @@ -365,14 +365,14 @@ void PpapiThread::OnMsgCreateChannel(int renderer_id, bool incognito) { Send(new PpapiHostMsg_ChannelCreated(channel_handle)); } -void PpapiThread::OnMsgResourceReply( +void PpapiThread::OnResourceReply( const ppapi::proxy::ResourceMessageReplyParams& reply_params, const IPC::Message& nested_msg) { ppapi::proxy::PluginDispatcher::DispatchResourceReply(reply_params, nested_msg); } -void PpapiThread::OnMsgSetNetworkState(bool online) { +void PpapiThread::OnSetNetworkState(bool online) { // Note the browser-process side shouldn't send us these messages in the // first unless the plugin has dev permissions, so we don't need to check // again here. We don't want random plugins depending on this dev interface. diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h index b6f84a8..a70e6d9 100644 --- a/content/ppapi_plugin/ppapi_thread.h +++ b/content/ppapi_plugin/ppapi_thread.h @@ -88,14 +88,13 @@ class PpapiThread : public ChildThread, virtual void SetActiveURL(const std::string& url) OVERRIDE; // Message handlers. - void OnMsgLoadPlugin(const FilePath& path, - const ppapi::PpapiPermissions& permissions); - void OnMsgCreateChannel(int renderer_id, - bool incognito); - void OnMsgResourceReply( + void OnLoadPlugin(const FilePath& path, + const ppapi::PpapiPermissions& permissions); + void OnCreateChannel(int renderer_id, bool incognito); + void OnResourceReply( const ppapi::proxy::ResourceMessageReplyParams& reply_params, const IPC::Message& nested_msg); - void OnMsgSetNetworkState(bool online); + void OnSetNetworkState(bool online); // Sets up the channel to the given renderer. On success, returns true and // fills the given ChannelHandle with the information from the new channel. diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index f8332b7..6582970 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -78,14 +78,14 @@ scoped_refptr<base::MessageLoopProxy> } void MockRenderThread::AddRoute(int32 routing_id, IPC::Listener* listener) { - // We may hear this for views created from OnMsgCreateWindow as well, + // We may hear this for views created from OnCreateWindow as well, // in which case we don't want to track the new widget. if (routing_id_ == routing_id) widget_ = listener; } void MockRenderThread::RemoveRoute(int32 routing_id) { - // We may hear this for views created from OnMsgCreateWindow as well, + // We may hear this for views created from OnCreateWindow as well, // in which case we don't want to track the new widget. if (routing_id_ == routing_id) widget_ = NULL; @@ -195,17 +195,17 @@ void MockRenderThread::SendCloseMessage() { } // The Widget expects to be returned valid route_id. -void MockRenderThread::OnMsgCreateWidget(int opener_id, - WebKit::WebPopupType popup_type, - int* route_id, - int* surface_id) { +void MockRenderThread::OnCreateWidget(int opener_id, + WebKit::WebPopupType popup_type, + int* route_id, + int* surface_id) { opener_id_ = opener_id; *route_id = routing_id_; *surface_id = surface_id_; } // The View expects to be returned a valid route_id different from its own. -void MockRenderThread::OnMsgCreateWindow( +void MockRenderThread::OnCreateWindow( const ViewHostMsg_CreateWindow_Params& params, int* route_id, int* surface_id, @@ -222,8 +222,8 @@ bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) { bool handled = true; bool msg_is_ok = true; IPC_BEGIN_MESSAGE_MAP_EX(MockRenderThread, msg, msg_is_ok) - IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnMsgCreateWidget) - IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnMsgCreateWindow) + IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget) + IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() return handled; diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h index a20dc54..b4b8700 100644 --- a/content/public/test/mock_render_thread.h +++ b/content/public/test/mock_render_thread.h @@ -109,15 +109,15 @@ class MockRenderThread : public RenderThread { virtual bool OnMessageReceived(const IPC::Message& msg); // The Widget expects to be returned valid route_id. - void OnMsgCreateWidget(int opener_id, - WebKit::WebPopupType popup_type, - int* route_id, - int* surface_id); + void OnCreateWidget(int opener_id, + WebKit::WebPopupType popup_type, + int* route_id, + int* surface_id); // The View expects to be returned a valid route_id different from its own. // We do not keep track of the newly created widget in MockRenderThread, // so it must be cleaned up on its own. - void OnMsgCreateWindow( + void OnCreateWindow( const ViewHostMsg_CreateWindow_Params& params, int* route_id, int* surface_id, @@ -141,7 +141,7 @@ class MockRenderThread : public RenderThread { // We only keep track of one Widget, we learn its pointer when it // adds a new route. We do not keep track of Widgets created with - // OnMsgCreateWindow. + // OnCreateWindow. IPC::Listener* widget_; // Routing id that will be assigned to a CreateWindow Widget. diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc index 95dd4ce..04909b5 100644 --- a/content/public/test/render_widget_test.cc +++ b/content/public/test/render_widget_test.cc @@ -43,15 +43,15 @@ void RenderWidgetTest::ResizeAndPaint(const gfx::Size& page_size, page_size.width() * page_size.height() * kNumBytesPerPixel, ++g_sequence_num)); - // Go ahead and map the DIB into memory, so that we can use it below - // to fill tmp_bitmap. Note that we need to do this before calling - // OnMsgPaintAtSize, or the last reference to the shared memory will - // be closed and the handle will no longer be valid. + // Go ahead and map the DIB into memory, so that we can use it below to fill + // tmp_bitmap. Note that we need to do this before calling OnPaintAtSize, or + // the last reference to the shared memory will be closed and the handle will + // no longer be valid. scoped_ptr<TransportDIB> mapped_pixels(TransportDIB::Map(pixels->handle())); RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); - impl->OnMsgPaintAtSize(pixels->handle(), g_sequence_num, page_size, - desired_size); + impl->OnPaintAtSize(pixels->handle(), g_sequence_num, page_size, + desired_size); ProcessPendingMessages(); const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching( ViewHostMsg_PaintAtSize_ACK::ID); diff --git a/content/renderer/pepper/pepper_audio_input_host.cc b/content/renderer/pepper/pepper_audio_input_host.cc index 89a08f1..413675a 100644 --- a/content/renderer/pepper/pepper_audio_input_host.cc +++ b/content/renderer/pepper/pepper_audio_input_host.cc @@ -60,11 +60,11 @@ int32_t PepperAudioInputHost::OnResourceMessageReceived( return result; IPC_BEGIN_MESSAGE_MAP(PepperAudioInputHost, msg) - PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_AudioInput_Open, OnMsgOpen) + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_AudioInput_Open, OnOpen) PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_AudioInput_StartOrStop, - OnMsgStartOrStop); + OnStartOrStop); PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_AudioInput_Close, - OnMsgClose); + OnClose); IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } @@ -89,7 +89,7 @@ webkit::ppapi::PluginDelegate* PepperAudioInputHost::GetPluginDelegate() { return NULL; } -int32_t PepperAudioInputHost::OnMsgOpen( +int32_t PepperAudioInputHost::OnOpen( ppapi::host::HostMessageContext* context, const std::string& device_id, PP_AudioSampleRate sample_rate, @@ -116,7 +116,7 @@ int32_t PepperAudioInputHost::OnMsgOpen( } } -int32_t PepperAudioInputHost::OnMsgStartOrStop( +int32_t PepperAudioInputHost::OnStartOrStop( ppapi::host::HostMessageContext* /* context */, bool capture) { if (!audio_input_) @@ -128,7 +128,7 @@ int32_t PepperAudioInputHost::OnMsgStartOrStop( return PP_OK; } -int32_t PepperAudioInputHost::OnMsgClose( +int32_t PepperAudioInputHost::OnClose( ppapi::host::HostMessageContext* /* context */) { Close(); return PP_OK; diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h index 70228f0..990c11c 100644 --- a/content/renderer/pepper/pepper_audio_input_host.h +++ b/content/renderer/pepper/pepper_audio_input_host.h @@ -47,13 +47,13 @@ class PepperAudioInputHost virtual webkit::ppapi::PluginDelegate* GetPluginDelegate() OVERRIDE; private: - int32_t OnMsgOpen(ppapi::host::HostMessageContext* context, - const std::string& device_id, - PP_AudioSampleRate sample_rate, - uint32_t sample_frame_count); - int32_t OnMsgStartOrStop(ppapi::host::HostMessageContext* context, - bool capture); - int32_t OnMsgClose(ppapi::host::HostMessageContext* context); + int32_t OnOpen(ppapi::host::HostMessageContext* context, + const std::string& device_id, + PP_AudioSampleRate sample_rate, + uint32_t sample_frame_count); + int32_t OnStartOrStop(ppapi::host::HostMessageContext* context, + bool capture); + int32_t OnClose(ppapi::host::HostMessageContext* context); void OnOpenComplete(int32_t result, base::SharedMemoryHandle shared_memory_handle, diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc index 1550737..4b21565 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc @@ -118,20 +118,20 @@ int32_t PepperDeviceEnumerationHostHelper::InternalHandleResourceMessage( *handled = true; IPC_BEGIN_MESSAGE_MAP(PepperDeviceEnumerationHostHelper, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL_0( - PpapiHostMsg_DeviceEnumeration_EnumerateDevices, OnMsgEnumerateDevices) + PpapiHostMsg_DeviceEnumeration_EnumerateDevices, OnEnumerateDevices) PPAPI_DISPATCH_HOST_RESOURCE_CALL( PpapiHostMsg_DeviceEnumeration_MonitorDeviceChange, - OnMsgMonitorDeviceChange) + OnMonitorDeviceChange) PPAPI_DISPATCH_HOST_RESOURCE_CALL_0( PpapiHostMsg_DeviceEnumeration_StopMonitoringDeviceChange, - OnMsgStopMonitoringDeviceChange) + OnStopMonitoringDeviceChange) IPC_END_MESSAGE_MAP() *handled = false; return PP_ERROR_FAILED; } -int32_t PepperDeviceEnumerationHostHelper::OnMsgEnumerateDevices( +int32_t PepperDeviceEnumerationHostHelper::OnEnumerateDevices( HostMessageContext* context) { if (enumerate_devices_context_.get()) return PP_ERROR_INPROGRESS; @@ -148,7 +148,7 @@ int32_t PepperDeviceEnumerationHostHelper::OnMsgEnumerateDevices( return PP_OK_COMPLETIONPENDING; } -int32_t PepperDeviceEnumerationHostHelper::OnMsgMonitorDeviceChange( +int32_t PepperDeviceEnumerationHostHelper::OnMonitorDeviceChange( HostMessageContext* /* context */, uint32_t callback_id) { monitor_.reset(new ScopedRequest( @@ -159,7 +159,7 @@ int32_t PepperDeviceEnumerationHostHelper::OnMsgMonitorDeviceChange( return monitor_->requested() ? PP_OK : PP_ERROR_FAILED; } -int32_t PepperDeviceEnumerationHostHelper::OnMsgStopMonitoringDeviceChange( +int32_t PepperDeviceEnumerationHostHelper::OnStopMonitoringDeviceChange( HostMessageContext* /* context */) { monitor_.reset(NULL); return PP_OK; diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.h b/content/renderer/pepper/pepper_device_enumeration_host_helper.h index db0af2d..0781f58 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.h +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.h @@ -71,10 +71,10 @@ class CONTENT_EXPORT PepperDeviceEnumerationHostHelper { ppapi::host::HostMessageContext* context, bool* handled); - int32_t OnMsgEnumerateDevices(ppapi::host::HostMessageContext* context); - int32_t OnMsgMonitorDeviceChange(ppapi::host::HostMessageContext* context, - uint32_t callback_id); - int32_t OnMsgStopMonitoringDeviceChange( + int32_t OnEnumerateDevices(ppapi::host::HostMessageContext* context); + int32_t OnMonitorDeviceChange(ppapi::host::HostMessageContext* context, + uint32_t callback_id); + int32_t OnStopMonitoringDeviceChange( ppapi::host::HostMessageContext* context); void OnEnumerateDevicesComplete( diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index 6628c51..72a5c1f 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc @@ -91,8 +91,7 @@ int32_t PepperFileChooserHost::OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) { IPC_BEGIN_MESSAGE_MAP(PepperFileChooserHost, msg) - PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FileChooser_Show, - OnMsgShow) + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FileChooser_Show, OnShow) IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } @@ -125,7 +124,7 @@ void PepperFileChooserHost::StoreChosenFiles( handler_ = NULL; // Handler deletes itself. } -int32_t PepperFileChooserHost::OnMsgShow( +int32_t PepperFileChooserHost::OnShow( ppapi::host::HostMessageContext* context, bool save_as, bool open_multiple, diff --git a/content/renderer/pepper/pepper_file_chooser_host.h b/content/renderer/pepper/pepper_file_chooser_host.h index d9f9a2a..af27768 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.h +++ b/content/renderer/pepper/pepper_file_chooser_host.h @@ -45,11 +45,11 @@ class CONTENT_EXPORT PepperFileChooserHost private: class CompletionHandler; - int32_t OnMsgShow(ppapi::host::HostMessageContext* context, - bool save_as, - bool open_multiple, - const std::string& suggested_file_name, - const std::vector<std::string>& accept_mime_types); + int32_t OnShow(ppapi::host::HostMessageContext* context, + bool save_as, + bool open_multiple, + const std::string& suggested_file_name, + const std::vector<std::string>& accept_mime_types); // Non-owning pointer. RendererPpapiHost* renderer_ppapi_host_; diff --git a/content/renderer/pepper/pepper_flash_clipboard_host.cc b/content/renderer/pepper/pepper_flash_clipboard_host.cc index 686d7f9..3de04c8 100644 --- a/content/renderer/pepper/pepper_flash_clipboard_host.cc +++ b/content/renderer/pepper/pepper_flash_clipboard_host.cc @@ -108,21 +108,21 @@ int32_t PepperFlashClipboardHost::OnResourceMessageReceived( IPC_BEGIN_MESSAGE_MAP(PepperFlashClipboardHost, msg) PPAPI_DISPATCH_HOST_RESOURCE_CALL( PpapiHostMsg_FlashClipboard_RegisterCustomFormat, - OnMsgRegisterCustomFormat); + OnRegisterCustomFormat); PPAPI_DISPATCH_HOST_RESOURCE_CALL( PpapiHostMsg_FlashClipboard_IsFormatAvailable, - OnMsgIsFormatAvailable); + OnIsFormatAvailable); PPAPI_DISPATCH_HOST_RESOURCE_CALL( PpapiHostMsg_FlashClipboard_ReadData, - OnMsgReadData); + OnReadData); PPAPI_DISPATCH_HOST_RESOURCE_CALL( PpapiHostMsg_FlashClipboard_WriteData, - OnMsgWriteData); + OnWriteData); IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } -int32_t PepperFlashClipboardHost::OnMsgRegisterCustomFormat( +int32_t PepperFlashClipboardHost::OnRegisterCustomFormat( ppapi::host::HostMessageContext* host_context, const std::string& format_name) { uint32_t format = custom_formats_.RegisterFormat(format_name); @@ -133,7 +133,7 @@ int32_t PepperFlashClipboardHost::OnMsgRegisterCustomFormat( return PP_OK; } -int32_t PepperFlashClipboardHost::OnMsgIsFormatAvailable( +int32_t PepperFlashClipboardHost::OnIsFormatAvailable( ppapi::host::HostMessageContext* host_context, uint32_t clipboard_type, uint32_t format) { @@ -178,7 +178,7 @@ int32_t PepperFlashClipboardHost::OnMsgIsFormatAvailable( return available ? PP_OK : PP_ERROR_FAILED; } -int32_t PepperFlashClipboardHost::OnMsgReadData( +int32_t PepperFlashClipboardHost::OnReadData( ppapi::host::HostMessageContext* host_context, uint32_t clipboard_type, uint32_t format) { @@ -263,7 +263,7 @@ int32_t PepperFlashClipboardHost::OnMsgReadData( return result; } -int32_t PepperFlashClipboardHost::OnMsgWriteData( +int32_t PepperFlashClipboardHost::OnWriteData( ppapi::host::HostMessageContext* host_context, uint32_t clipboard_type, const std::vector<uint32_t>& formats, diff --git a/content/renderer/pepper/pepper_flash_clipboard_host.h b/content/renderer/pepper/pepper_flash_clipboard_host.h index e327c2e..1fd2451 100644 --- a/content/renderer/pepper/pepper_flash_clipboard_host.h +++ b/content/renderer/pepper/pepper_flash_clipboard_host.h @@ -48,18 +48,18 @@ class PepperFlashClipboardHost : public ppapi::host::ResourceHost { ppapi::host::HostMessageContext* context) OVERRIDE; private: - int32_t OnMsgRegisterCustomFormat( + int32_t OnRegisterCustomFormat( ppapi::host::HostMessageContext* host_context, const std::string& format_name); - int32_t OnMsgIsFormatAvailable( + int32_t OnIsFormatAvailable( ppapi::host::HostMessageContext* host_context, uint32_t clipboard_type, uint32_t format); - int32_t OnMsgReadData( + int32_t OnReadData( ppapi::host::HostMessageContext* host_context, uint32_t clipoard_type, uint32_t format); - int32_t OnMsgWriteData( + int32_t OnWriteData( ppapi::host::HostMessageContext* host_context, uint32_t clipboard_type, const std::vector<uint32_t>& formats, diff --git a/content/renderer/pepper/pepper_in_process_router.cc b/content/renderer/pepper/pepper_in_process_router.cc index 5bcc8c7..1cdccc2 100644 --- a/content/renderer/pepper/pepper_in_process_router.cc +++ b/content/renderer/pepper/pepper_in_process_router.cc @@ -107,7 +107,7 @@ void PepperInProcessRouter::DispatchPluginMsg(IPC::Message* msg) { // Emulate the proxy by dispatching the relevant message here. bool handled = true; IPC_BEGIN_MESSAGE_MAP(PepperInProcessRouter, *msg) - IPC_MESSAGE_HANDLER(PpapiPluginMsg_ResourceReply, OnMsgResourceReply) + IPC_MESSAGE_HANDLER(PpapiPluginMsg_ResourceReply, OnResourceReply) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() DCHECK(handled) << "The message wasn't handled by the plugin."; @@ -119,7 +119,7 @@ bool PepperInProcessRouter::DummySendTo(IPC::Message *msg) { return false; } -void PepperInProcessRouter::OnMsgResourceReply( +void PepperInProcessRouter::OnResourceReply( const ppapi::proxy::ResourceMessageReplyParams& reply_params, const IPC::Message& nested_msg) { ppapi::Resource* resource = diff --git a/content/renderer/pepper/pepper_in_process_router.h b/content/renderer/pepper/pepper_in_process_router.h index af8e2c4..bc2d547 100644 --- a/content/renderer/pepper/pepper_in_process_router.h +++ b/content/renderer/pepper/pepper_in_process_router.h @@ -71,7 +71,7 @@ class PepperInProcessRouter { bool DummySendTo(IPC::Message *msg); // Handles resource reply messages from the host. - void OnMsgResourceReply( + void OnResourceReply( const ppapi::proxy::ResourceMessageReplyParams& reply_params, const IPC::Message& nested_msg); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 8f70fc6..619ed29 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2712,7 +2712,7 @@ void RenderViewImpl::loadURLExternally( } void RenderViewImpl::Repaint(const gfx::Size& size) { - OnMsgRepaint(size); + OnRepaint(size); } void RenderViewImpl::SetEditCommandForNextKeyEvent(const std::string& name, diff --git a/content/renderer/render_view_mouse_lock_dispatcher.cc b/content/renderer/render_view_mouse_lock_dispatcher.cc index bafdea8..a7a0bd9 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.cc +++ b/content/renderer/render_view_mouse_lock_dispatcher.cc @@ -40,7 +40,7 @@ bool RenderViewMouseLockDispatcher::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RenderViewMouseLockDispatcher, message) - IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnMsgLockMouseACK) + IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK) IPC_MESSAGE_FORWARD(ViewMsg_MouseLockLost, static_cast<MouseLockDispatcher*>(this), MouseLockDispatcher::OnMouseLockLost) @@ -49,9 +49,9 @@ bool RenderViewMouseLockDispatcher::OnMessageReceived( return handled; } -void RenderViewMouseLockDispatcher::OnMsgLockMouseACK(bool succeeded) { +void RenderViewMouseLockDispatcher::OnLockMouseACK(bool succeeded) { // Notify the base class. - OnLockMouseACK(succeeded); + MouseLockDispatcher::OnLockMouseACK(succeeded); // Mouse Lock removes the system cursor and provides all mouse motion as // .movementX/Y values on events all sent to a fixed target. This requires diff --git a/content/renderer/render_view_mouse_lock_dispatcher.h b/content/renderer/render_view_mouse_lock_dispatcher.h index 5a5455f..4e16c57 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.h +++ b/content/renderer/render_view_mouse_lock_dispatcher.h @@ -28,7 +28,7 @@ class RenderViewMouseLockDispatcher : public MouseLockDispatcher, // RenderView::Observer implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - void OnMsgLockMouseACK(bool succeeded); + void OnLockMouseACK(bool succeeded); RenderViewImpl* render_view_impl_; diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 22b63c3..6e38df8 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -243,10 +243,9 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewMsg_SetInputMethodActive, OnSetInputMethodActive) IPC_MESSAGE_HANDLER(ViewMsg_ImeSetComposition, OnImeSetComposition) IPC_MESSAGE_HANDLER(ViewMsg_ImeConfirmComposition, OnImeConfirmComposition) - IPC_MESSAGE_HANDLER(ViewMsg_PaintAtSize, OnMsgPaintAtSize) - IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnMsgRepaint) - IPC_MESSAGE_HANDLER(ViewMsg_SmoothScrollCompleted, - OnMsgSmoothScrollCompleted) + IPC_MESSAGE_HANDLER(ViewMsg_PaintAtSize, OnPaintAtSize) + IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint) + IPC_MESSAGE_HANDLER(ViewMsg_SmoothScrollCompleted, OnSmoothScrollCompleted) IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection) IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck) IPC_MESSAGE_HANDLER(ViewMsg_ScreenInfoChanged, OnScreenInfoChanged) @@ -1509,10 +1508,10 @@ void RenderWidget::OnImeConfirmComposition( // This message causes the renderer to render an image of the // desired_size, regardless of whether the tab is hidden or not. -void RenderWidget::OnMsgPaintAtSize(const TransportDIB::Handle& dib_handle, - int tag, - const gfx::Size& page_size, - const gfx::Size& desired_size) { +void RenderWidget::OnPaintAtSize(const TransportDIB::Handle& dib_handle, + int tag, + const gfx::Size& page_size, + const gfx::Size& desired_size) { if (!webwidget_ || !TransportDIB::is_valid_handle(dib_handle)) { if (TransportDIB::is_valid_handle(dib_handle)) { // Close our unused handle. @@ -1587,7 +1586,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB::Handle& dib_handle, Send(new ViewHostMsg_PaintAtSize_ACK(routing_id_, tag, bounds.size())); } -void RenderWidget::OnMsgRepaint(const gfx::Size& size_to_paint) { +void RenderWidget::OnRepaint(const gfx::Size& size_to_paint) { // During shutdown we can just ignore this message. if (!webwidget_) return; @@ -1602,7 +1601,7 @@ void RenderWidget::OnMsgRepaint(const gfx::Size& size_to_paint) { } } -void RenderWidget::OnMsgSmoothScrollCompleted(int gesture_id) { +void RenderWidget::OnSmoothScrollCompleted(int gesture_id) { PendingSmoothScrollGestureMap::iterator it = pending_smooth_scroll_gestures_.find(gesture_id); DCHECK(it != pending_smooth_scroll_gestures_.end()); diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 631455f..02b03b1 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -277,12 +277,12 @@ class CONTENT_EXPORT RenderWidget int selection_end); virtual void OnImeConfirmComposition( const string16& text, const ui::Range& replacement_range); - void OnMsgPaintAtSize(const TransportDIB::Handle& dib_id, - int tag, - const gfx::Size& page_size, - const gfx::Size& desired_size); - void OnMsgRepaint(const gfx::Size& size_to_paint); - void OnMsgSmoothScrollCompleted(int gesture_id); + void OnPaintAtSize(const TransportDIB::Handle& dib_id, + int tag, + const gfx::Size& page_size, + const gfx::Size& desired_size); + void OnRepaint(const gfx::Size& size_to_paint); + void OnSmoothScrollCompleted(int gesture_id); void OnSetTextDirection(WebKit::WebTextDirection direction); void OnGetFPS(); void OnScreenInfoChanged(const WebKit::WebScreenInfo& screen_info); |