content/browser/compositor/surface_utils.cc - Issue 1649483002: Revert of 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/surface_utils.cc

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

Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 11 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/browser/compositor/gpu_process_transport_factory.cc ('k') | content/browser/devtools/render_frame_devtools_agent_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/surface_utils.cc

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

index 7ae05912a656db51831f62a90dd1adf149700f08..1049ba2484a8244afe9ae5b1d6e6930ac664afb0 100644

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

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

@@ -7,7 +7,7 @@

#include "build/build_config.h"

#include "cc/surfaces/surface_id_allocator.h"

-#if defined(OS_ANDROID) && !defined(USE_AURA)

+#if defined(OS_ANDROID)

#include "content/browser/renderer_host/compositor_impl_android.h"

#else

#include "content/browser/compositor/image_transport_factory.h"

@@ -17,7 +17,7 @@

namespace content {

scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() {

-#if defined(OS_ANDROID) && !defined(USE_AURA)

+#if defined(OS_ANDROID)

return CompositorImpl::CreateSurfaceIdAllocator();

#else

ImageTransportFactory* factory = ImageTransportFactory::GetInstance();

@@ -26,7 +26,7 @@ scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() {

}

cc::SurfaceManager* GetSurfaceManager() {

-#if defined(OS_ANDROID) && !defined(USE_AURA)

+#if defined(OS_ANDROID)

return CompositorImpl::GetSurfaceManager();

#else

ImageTransportFactory* factory = ImageTransportFactory::GetInstance();