From f027ca150193efb6b486ade12177d83636467d1a Mon Sep 17 00:00:00 2001 From: "sievers@chromium.org" Date: Fri, 21 Dec 2012 01:42:32 +0000 Subject: Aura/Android: Send mailbox name with every Swap message. This eliminates GpuHostMsg_AcceleratedSurfaceNew and instead of using a handle to identify textures being swapped and returned, it simply uses the mailbox name. This will make it simplifier to put textures in the mailbox from the client, i.e. renderer. Review URL: https://chromiumcodereview.appspot.com/11608005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174313 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_plugin/browser_plugin_embedder.cc | 4 ++-- content/browser/browser_plugin/browser_plugin_embedder.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'content/browser/browser_plugin') diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc index ade5081..3d60f39 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.cc +++ b/content/browser/browser_plugin/browser_plugin_embedder.cc @@ -331,10 +331,10 @@ void BrowserPluginEmbedder::OnPluginDestroyed(int instance_id) { void BrowserPluginEmbedder::OnSwapBuffersACK(int route_id, int gpu_host_id, - uint64 surface_handle, + const std::string& mailbox_name, uint32 sync_point) { AcceleratedSurfaceMsg_BufferPresented_Params ack_params; - ack_params.surface_handle = 0; // TODO + ack_params.mailbox_name = mailbox_name; ack_params.sync_point = sync_point; RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, gpu_host_id, diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h index 5216ace..b4e846a 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.h +++ b/content/browser/browser_plugin/browser_plugin_embedder.h @@ -114,7 +114,7 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver, void OnPluginDestroyed(int instance_id); void OnSwapBuffersACK(int route_id, int gpu_host_id, - uint64 surface_handle, + const std::string& mailbox_name, uint32 sync_point); // Static factory instance (always NULL for non-test). -- cgit v1.1