diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 00:50:36 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 00:50:36 +0000 |
| commit | d369af4265173acaebf400019561bb9b08a73b0a (patch) | |
| tree | 8dcf64facb1199ef3166b497eac19e598ee85d5c | |
| parent | a47f8eadd67f75d3b663fdcc898caabb335bad0b (diff) | |
| download | chromium_src-d369af4265173acaebf400019561bb9b08a73b0a.zip chromium_src-d369af4265173acaebf400019561bb9b08a73b0a.tar.gz chromium_src-d369af4265173acaebf400019561bb9b08a73b0a.tar.bz2 | |
Moved TextureTransport into content/common/gpu.
It landed while I was working on the bigger move from content/gpu to content/common/gpu.
Also renamed gpu_info_unittest_win.cc to gpu_info_collector_unittest_win.cc because that is what it is.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/6824050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81344 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 | ||||
| -rw-r--r-- | content/common/gpu/transport_texture.cc (renamed from content/gpu/transport_texture.cc) | 2 | ||||
| -rw-r--r-- | content/common/gpu/transport_texture.h (renamed from content/gpu/transport_texture.h) | 6 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_unittest_win.cc (renamed from content/gpu/gpu_info_unittest_win.cc) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 3325753..4368723 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1893,6 +1893,7 @@ '../content/common/font_descriptor_mac_unittest.mm', '../content/common/gpu_feature_flags_unittest.cc', '../content/common/gpu/gpu_info_unittest.cc', + '../content/common/gpu/gpu_video_decoder_unittest.cc', '../content/common/mru_cache_unittest.cc', '../content/common/notification_service_unittest.cc', '../content/common/process_watcher_unittest.cc', @@ -1906,8 +1907,7 @@ '../content/gpu/gpu_idirect3d9_mock_win.cc', '../content/gpu/gpu_idirect3d9_mock_win.h', '../content/gpu/gpu_info_collector_unittest.cc', - '../content/gpu/gpu_info_unittest_win.cc', - '../content/common/gpu/gpu_video_decoder_unittest.cc', + '../content/gpu/gpu_info_collector_unittest_win.cc', '../content/renderer/active_notification_tracker_unittest.cc', '../content/renderer/audio_message_filter_unittest.cc', '../content/renderer/gpu_video_decoder_host_unittest.cc', diff --git a/content/gpu/transport_texture.cc b/content/common/gpu/transport_texture.cc index 1cfcfb8..0f99791 100644 --- a/content/gpu/transport_texture.cc +++ b/content/common/gpu/transport_texture.cc @@ -4,7 +4,7 @@ #include "content/common/gpu_messages.h" #include "content/common/gpu/gpu_channel.h" -#include "content/gpu/transport_texture.h" +#include "content/common/gpu/transport_texture.h" TransportTexture::TransportTexture(GpuChannel* channel, IPC::Message::Sender* sender, diff --git a/content/gpu/transport_texture.h b/content/common/gpu/transport_texture.h index 577d277..bf31074 100644 --- a/content/gpu/transport_texture.h +++ b/content/common/gpu/transport_texture.h @@ -8,8 +8,8 @@ // // See content/gpu/transport_texture_host.h for usage and details. -#ifndef CONTENT_GPU_TRANSPORT_TEXTURE_H_ -#define CONTENT_GPU_TRANSPORT_TEXTURE_H_ +#ifndef CONTENT_COMMON_GPU_TRANSPORT_TEXTURE_H_ +#define CONTENT_COMMON_GPU_TRANSPORT_TEXTURE_H_ #include <vector> #include <map> @@ -95,4 +95,4 @@ class TransportTexture : public IPC::Channel::Listener { DISALLOW_COPY_AND_ASSIGN(TransportTexture); }; -#endif // CONTENT_GPU_TRANSPORT_TEXTURE_H_ +#endif // CONTENT_COMMON_GPU_TRANSPORT_TEXTURE_H_ diff --git a/content/content_common.gypi b/content/content_common.gypi index 20fc69f..22ca40e 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -118,6 +118,8 @@ 'common/gpu/media/fake_gl_video_decode_engine.h', 'common/gpu/media/fake_gl_video_device.cc', 'common/gpu/media/fake_gl_video_device.h', + 'common/gpu/transport_texture.cc', + 'common/gpu/transport_texture.h', 'common/gpu_process_launch_causes.h', 'common/gpu_messages.h', 'common/hi_res_timer_manager_posix.cc', diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index ffa7c4c..fea5677f 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -31,8 +31,6 @@ 'gpu/gpu_child_thread.h', 'gpu/gpu_watchdog_thread.cc', 'gpu/gpu_watchdog_thread.h', - 'gpu/transport_texture.cc', - 'gpu/transport_texture.h', ], 'include_dirs': [ '..', diff --git a/content/gpu/gpu_info_unittest_win.cc b/content/gpu/gpu_info_collector_unittest_win.cc index 8782f10..8782f10 100644 --- a/content/gpu/gpu_info_unittest_win.cc +++ b/content/gpu/gpu_info_collector_unittest_win.cc |