diff options
| author | fsamuel <fsamuel@chromium.org> | 2016-03-23 17:27:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 00:28:29 +0000 |
| commit | c27742238e78f1e2f7f6fe37f101eb0d07483416 (patch) | |
| tree | e15a09d867f489fc54367b3bbfa5d04432b395b6 /content/gpu/gpu_main.cc | |
| parent | 26befa044b2ce9ed1b5dfd83eb5a67d1a964bb8c (diff) | |
| download | chromium_src-c27742238e78f1e2f7f6fe37f101eb0d07483416.zip chromium_src-c27742238e78f1e2f7f6fe37f101eb0d07483416.tar.gz chromium_src-c27742238e78f1e2f7f6fe37f101eb0d07483416.tar.bz2 | |
Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport
GpuMemoryBufferFactory is a gpu service concept and should
not be accessed from the client.
Client code accessed GpuMemoryBufferFactory to get the
native GPU buffer type and to check whether a provided
buffer is supported. Depending on GpuMemoryBufferFactory
ends up pulling in other service-only bits.
This CL addresses this issue. The two static methods
accessed by clients are pulled into a new class:
GpuMemoryBufferSupport placed in gpu/ipc/common.
BUG=597170
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1831513003
Cr-Commit-Position: refs/heads/master@{#382987}
Diffstat (limited to 'content/gpu/gpu_main.cc')
| -rw-r--r-- | content/gpu/gpu_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 9c2211e..620a5e0 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -35,6 +35,7 @@ #include "gpu/config/gpu_info_collector.h" #include "gpu/config/gpu_switches.h" #include "gpu/config/gpu_util.h" +#include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "ui/events/platform/platform_event_source.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_implementation.h" @@ -388,7 +389,7 @@ int GpuMain(const MainFunctionParams& parameters) { logging::SetLogMessageHandler(NULL); scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory; - if (GpuMemoryBufferFactory::GetNativeType() != gfx::EMPTY_BUFFER) + if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) gpu_memory_buffer_factory = GpuMemoryBufferFactory::CreateNativeType(); gpu::SyncPointManager sync_point_manager(false); |