diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 23:55:56 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 23:55:56 +0000 |
| commit | bc4a343d38e945209a2aa02572af3e71c89cae42 (patch) | |
| tree | 6312f02d108f26184e8d6ef193117e538cf5f134 /content/content_common.gypi | |
| parent | 4c136c6a49b15a2e5824682d858a21d8becb4259 (diff) | |
| download | chromium_src-bc4a343d38e945209a2aa02572af3e71c89cae42.zip chromium_src-bc4a343d38e945209a2aa02572af3e71c89cae42.tar.gz chromium_src-bc4a343d38e945209a2aa02572af3e71c89cae42.tar.bz2 | |
Revert 111040 - 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/8620006
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/8625003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index 739c0b6..61e1d9e 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -143,10 +143,6 @@ 'common/gpu/gpu_process_launch_causes.h', 'common/gpu/gpu_watchdog.h', 'common/gpu/image_transport_surface.h', - 'common/gpu/image_transport_surface.cc', - 'common/gpu/image_transport_surface_linux.cc', - 'common/gpu/image_transport_surface_mac.cc', - 'common/gpu/image_transport_surface_win.cc', 'common/gpu/media/gpu_video_decode_accelerator.cc', 'common/gpu/media/gpu_video_decode_accelerator.h', 'common/gpu/transport_texture.cc', @@ -276,6 +272,10 @@ 'sources!': [ 'common/process_watcher_posix.cc', ], + 'sources': [ + 'common/gpu/image_transport_surface.cc', + 'common/gpu/image_transport_surface_mac.cc', + ], 'link_settings': { 'mac_bundle_resources': [ 'common/common.sb', @@ -298,7 +298,11 @@ 'common/gpu/x_util.h', ], }], - ['OS=="linux"', { + ['ui_compositor_image_transport==1', { + 'sources': [ + 'common/gpu/image_transport_surface.cc', + 'common/gpu/image_transport_surface_linux.cc', + ], 'include_dirs': [ '<(DEPTH)/third_party/angle/include', ], |