content/gpu/gpu_main.cc - Issue 1831513003: Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/gpu/gpu_main.cc

Issue 1831513003: Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed ifdef mixup Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_test_template.h ('k') | content/gpu/in_process_gpu_thread.cc » ('j') | gpu/ipc/common/gpu_memory_buffer_support.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/gpu/gpu_main.cc

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc

index 9c2211edecfbd6ba2124a835adab9f7c12784473..620a5e0397436d8d3075b9f73d1398ac11349aa9 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);