content/browser/compositor/gpu_process_transport_factory.cc - Issue 1411503005: Aura on Android: content/browser

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/browser/compositor/gpu_process_transport_factory.cc

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file

Patch Set: Addressing remaining feedback, cleaning up build files. Created 5 years, 1 month 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

« content/browser/browser_main_runner.cc ('K') | « content/browser/browser_main_runner.cc ('k') | content/browser/compositor/surface_utils.cc » ('j') | content/browser/web_contents/web_contents_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/gpu_process_transport_factory.cc

diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc

index b74845fde4401ceebbcef7086f79d094f8ad50d3..7e2c513b98ee9302d10509f564f4869f85cc7422 100644

--- a/content/browser/compositor/gpu_process_transport_factory.cc

+++ b/content/browser/compositor/gpu_process_transport_factory.cc

@@ -133,11 +133,16 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {

scoped_ptr<WebGraphicsContext3DCommandBufferImpl>

GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {

+#if defined(OS_ANDROID)

+ // TODO(mfomitchev): crbug.com/546716

+ return CreateContextCommon(scoped_refptr<GpuChannelHost>(nullptr), 0);

+#else

CauseForGpuLaunch cause =

CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;

scoped_refptr<GpuChannelHost> gpu_channel_host(

BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause));

return CreateContextCommon(gpu_channel_host, 0);

+#endif // OS_ANDROID

}

scoped_ptr<cc::SoftwareOutputDevice>