content/browser/browser_main_loop.cc - Issue 634643002: content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers.

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/browser_main_loop.cc

Issue 634643002: content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase and address some review feedback Created 6 years, 2 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

« content/browser/android/browser_surface_texture_manager.cc ('K') | « content/browser/android/surface_texture_peer_browser_impl.cc ('k') | content/browser/renderer_host/compositor_impl_android.h » ('j') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index d9bfded9f2230b6c0c0b124edf5bf0d3089fde8d..0455fadea421837b41c60f4236359d5acf3bca88 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

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

#if defined(OS_ANDROID)

#include "base/android/jni_android.h"

#include "content/browser/android/browser_startup_controller.h"

-#include "content/browser/android/surface_texture_peer_browser_impl.h"

+#include "content/browser/android/browser_surface_texture_manager.h"

#include "content/browser/android/tracing_controller_android.h"

#include "ui/gl/gl_surface.h"

#endif

@@ -537,8 +537,8 @@ void BrowserMainLoop::MainMessageLoopStart() {

#if defined(OS_ANDROID)

{

- TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTexturePeer");

- SurfaceTexturePeer::InitInstance(new SurfaceTexturePeerBrowserImpl());

+ TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");

+ SurfaceTextureManager::InitInstance(new BrowserSurfaceTextureManager);

}

#endif