diff options
| author | kcarattini <kcarattini@chromium.org> | 2015-06-28 22:45:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-29 05:46:16 +0000 |
| commit | 1cf221f6cebc8850220100c24d00a18ad54bfe8d (patch) | |
| tree | 2a6c6bbef71b25f804e196f178ba4b5aed76f2e2 /content/gpu/gpu_main.cc | |
| parent | 09d7e98343a5a7da981b3cac24d726dbcae79988 (diff) | |
| download | chromium_src-1cf221f6cebc8850220100c24d00a18ad54bfe8d.zip chromium_src-1cf221f6cebc8850220100c24d00a18ad54bfe8d.tar.gz chromium_src-1cf221f6cebc8850220100c24d00a18ad54bfe8d.tar.bz2 | |
Revert of content: Fix single process support for native GpuMemoryBuffers. (patchset #1 id:1 of https://codereview.chromium.org/1221473003/)
Reason for revert:
XP_tests started failing with "missing shard" exceptions. Suspect this cl.
https://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/38438
Original issue's description:
> content: Fix single process support for native GpuMemoryBuffers.
>
> Also add the startup message filter for CreateGpuMemoryBuffer
> messages in single process mode.
>
> BUG=497559,504121
>
> Committed: https://crrev.com/29ec87df6cef29b9f28dd21d385f16ce99df9ce3
> Cr-Commit-Position: refs/heads/master@{#336495}
TBR=piman@chromium.org,reveman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=497559,504121
Review URL: https://codereview.chromium.org/1210073003
Cr-Commit-Position: refs/heads/master@{#336531}
Diffstat (limited to 'content/gpu/gpu_main.cc')
| -rw-r--r-- | content/gpu/gpu_main.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 1a543ca..f520aeb 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -365,9 +365,12 @@ int GpuMain(const MainFunctionParams& parameters) { logging::SetLogMessageHandler(NULL); + std::vector<gfx::GpuMemoryBufferType> supported_types; + GpuMemoryBufferFactory::GetSupportedTypes(&supported_types); + DCHECK(!supported_types.empty()); + // Note: We always use the preferred type. scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory = - GpuMemoryBufferFactory::Create( - GpuChildThread::GetGpuMemoryBufferFactoryType()); + GpuMemoryBufferFactory::Create(supported_types[0]); GpuProcess gpu_process; |