From 95d3182359968c2ede57e70e05b80d93ccdf2bf5 Mon Sep 17 00:00:00 2001 From: "kenrb@chromium.org" Date: Fri, 3 Jan 2014 22:21:55 +0000 Subject: Adding RenderWidgetHostViewChildFrame for OOPIF view. RenderWidgetHostViewChildFrame becomes the view class for child frames being rendered in a different process from their parent. CrossProcessFrameConnector is a supporting class for that, encapsulating state specific to the parent/child frame relationship. RenderWidgetHostViewGuest is made a subclass of RenderWidgetHostViewChildFrame in order to keep them synchronized. Gradually we will move all functionality from RWHVGuest to RWHVChildFrame and then get rid of RWHVGuest altogether. TBR=sadrul BUG=325803 Review URL: https://codereview.chromium.org/100473010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242942 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_plugin/browser_plugin_guest.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'content/browser/browser_plugin/browser_plugin_guest.h') diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h index 46c95a4..84675b5 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.h +++ b/content/browser/browser_plugin/browser_plugin_guest.h @@ -45,6 +45,8 @@ struct BrowserPluginHostMsg_AutoSize_Params; struct BrowserPluginHostMsg_Attach_Params; struct BrowserPluginHostMsg_ResizeGuest_Params; +struct FrameHostMsg_BuffersSwappedACK_Params; +struct FrameHostMsg_CompositorFrameSwappedACK_Params; struct ViewHostMsg_CreateWindow_Params; #if defined(OS_MACOSX) struct ViewHostMsg_ShowPopup_Params; @@ -382,11 +384,9 @@ class CONTENT_EXPORT BrowserPluginGuest // Message handlers for messages from embedder. - void OnCompositorFrameACK(int instance_id, - int route_id, - uint32 output_surface_id, - int renderer_host_id, - const cc::CompositorFrameAck& ack); + void OnCompositorFrameSwappedACK( + int instance_id, + const FrameHostMsg_CompositorFrameSwappedACK_Params& params); void OnCopyFromCompositingSurfaceAck(int instance_id, int request_id, const SkBitmap& bitmap); @@ -457,10 +457,7 @@ class CONTENT_EXPORT BrowserPluginGuest void OnSetVisibility(int instance_id, bool visible); // Message from embedder acknowledging last HW buffer. void OnSwapBuffersACK(int instance_id, - int route_id, - int gpu_host_id, - const std::string& mailbox_name, - uint32 sync_point); + const FrameHostMsg_BuffersSwappedACK_Params& params); void OnUnlockMouse(); void OnUnlockMouseAck(int instance_id); void OnUpdateGeometry(int instance_id, const gfx::Rect& view_rect); -- cgit v1.1