diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 23:12:03 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 23:12:03 +0000 |
| commit | 2a7568a99f309fbd54bb33d9b3b35c88c63b8283 (patch) | |
| tree | c7514b6b87e6a6323f0d983b2201885167b4d0cc /gpu/command_buffer/service/query_manager.cc | |
| parent | 26385174eecea18029fcdf32eb1725924e75a5a8 (diff) | |
| download | chromium_src-2a7568a99f309fbd54bb33d9b3b35c88c63b8283.zip chromium_src-2a7568a99f309fbd54bb33d9b3b35c88c63b8283.tar.gz chromium_src-2a7568a99f309fbd54bb33d9b3b35c88c63b8283.tar.bz2 | |
GPU: Move some GPU process specific code from ui/gl to gpu/command_buffer/service
No functional change.
ui/gl/async_pixel_transfer_delegate* ---> gpu/command_buffer/service
ui/gl/safe_shared_memory_pool* --> gpu/command_buffer/service
BUG=235229
TEST=bots stay green
Review URL: https://chromiumcodereview.appspot.com/14864015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/query_manager.cc')
| -rw-r--r-- | gpu/command_buffer/service/query_manager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc index 7b41232..a6efd47 100644 --- a/gpu/command_buffer/service/query_manager.cc +++ b/gpu/command_buffer/service/query_manager.cc @@ -10,10 +10,10 @@ #include "base/shared_memory.h" #include "base/time.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" +#include "gpu/command_buffer/service/async_pixel_transfer_delegate.h" #include "gpu/command_buffer/service/error_state.h" #include "gpu/command_buffer/service/feature_info.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "ui/gl/async_pixel_transfer_delegate.h" namespace gpu { namespace gles2 { @@ -183,7 +183,7 @@ class AsyncPixelTransfersCompletedQuery virtual ~AsyncPixelTransfersCompletedQuery(); static void MarkAsCompletedThreadSafe( - uint32 submit_count, const gfx::AsyncMemoryParams& mem_params) { + uint32 submit_count, const AsyncMemoryParams& mem_params) { DCHECK(mem_params.shared_memory); DCHECK(mem_params.shared_memory->memory()); void *data = static_cast<int8*>(mem_params.shared_memory->memory()) + @@ -207,7 +207,7 @@ bool AsyncPixelTransfersCompletedQuery::Begin() { } bool AsyncPixelTransfersCompletedQuery::End(uint32 submit_count) { - gfx::AsyncMemoryParams mem_params; + AsyncMemoryParams mem_params; // Get the real shared memory since it might need to be duped to prevent // use-after-free of the memory. Buffer buffer = manager()->decoder()->GetSharedMemoryBuffer(shm_id()); |