diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 23:25:23 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 23:25:23 +0000 |
commit | 290fc49d46142b94f9c7754c8c3cf36408b9a269 (patch) | |
tree | d42113d9b5be8c7e8e7ef94dbdb6d949a5325d69 /content/common/gpu/gpu_command_buffer_stub.h | |
parent | 5902f29b579cba7f1a11b2b6d02b5d3a1f4516cf (diff) | |
download | chromium_src-290fc49d46142b94f9c7754c8c3cf36408b9a269.zip chromium_src-290fc49d46142b94f9c7754c8c3cf36408b9a269.tar.gz chromium_src-290fc49d46142b94f9c7754c8c3cf36408b9a269.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.
Original Review URL: http://codereview.chromium.org/8060045
Review URL: http://codereview.chromium.org/8622004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_command_buffer_stub.h')
-rw-r--r-- | content/common/gpu/gpu_command_buffer_stub.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index 6ece34f..f581593 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -65,6 +65,9 @@ class GpuCommandBufferStub // Whether this command buffer can currently handle IPC messages. bool IsScheduled(); + // Set the swap interval according to the command line. + void SetSwapInterval(); + gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); } gpu::GpuScheduler* scheduler() const { return scheduler_.get(); } @@ -78,8 +81,6 @@ class GpuCommandBufferStub // to the same renderer process. int32 route_id() const { return route_id_; } - void ViewResized(); - gfx::GpuPreference gpu_preference() { return gpu_preference_; } private: @@ -117,22 +118,11 @@ class GpuCommandBufferStub void OnSetSurfaceVisible(bool visible); -#if defined(OS_MACOSX) - void OnSwapBuffers(); - - // Returns the id of the current surface that is being rendered to - // (or 0 if no such surface has been created). - uint64 GetSurfaceId(); -#endif - void OnCommandProcessed(); void OnParseError(); - void OnResize(gfx::Size size); void ReportState(); - void SetSwapInterval(); - // The lifetime of objects of this class is managed by a GpuChannel. The // GpuChannels destroy all the GpuCommandBufferStubs that they own when they // are destroyed. So a raw pointer is safe. |