diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 20:11:26 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 20:11:26 +0000 |
| commit | 1269f0c982d224953bf85bb0a10610eeec5ee8ea (patch) | |
| tree | 2588f1683e1180e69b814866782e5f3339a06a9a /content/browser/renderer_host/render_widget_host_view_aura.h | |
| parent | 05fcb9c7b86c1348d7ee3b37cc4aed26399542e1 (diff) | |
| download | chromium_src-1269f0c982d224953bf85bb0a10610eeec5ee8ea.zip chromium_src-1269f0c982d224953bf85bb0a10610eeec5ee8ea.tar.gz chromium_src-1269f0c982d224953bf85bb0a10610eeec5ee8ea.tar.bz2 | |
Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buffer to the browser process for presentation.
Implemented ImageTransportSurface for Linux (without texture sharing), XP, Vista and 7. XP. The non-texture sharing Linux and XP paths just present directly to the compositing child window owned by the browser process as before.
PassThroughImageTransportSurface still needs a proper name. I will move it into its own file once that is decided.
I moved AcceleratedSurfaceBuffersSwapped outside of the platform specific ifdefs and made the signature the same on all platforms for greater consistency.
I removed the code related to sharing surfaces between processes and synchronizing resize and swapping out of GpuCommandBufferStub. It is all now in ImageTransportSurface implementations.
Review URL: http://codereview.chromium.org/8060045
TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/8591006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_view_aura.h')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 495b69b..e654164 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -70,16 +70,15 @@ class CONTENT_EXPORT RenderWidgetHostViewAura : public RenderWidgetHostView, virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE; virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; virtual void OnAcceleratedCompositingStateChange() OVERRIDE; + virtual void AcceleratedSurfaceBuffersSwapped( + const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, + int gpu_host_id) OVERRIDE; #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) virtual void AcceleratedSurfaceNew( int32 width, int32 height, uint64* surface_id, TransportDIB::Handle* surface_handle) OVERRIDE; - virtual void AcceleratedSurfaceBuffersSwapped( - uint64 surface_id, - int32 route_id, - int gpu_host_id) OVERRIDE; virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; #endif virtual void SetBackground(const SkBitmap& background) OVERRIDE; |