android_webview/native/aw_contents.cc - Issue 1943963003: WIP Handle AwContents needing multiple live functors.

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: android_webview/native/aw_contents.cc

Issue 1943963003: WIP Handle AwContents needing multiple live functors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Testing framework changes to support testing multiple RenderThreadManager instances. Created 4 years, 7 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

« android_webview/java/src/org/chromium/android_webview/AwContents.java ('K') | « android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java ('k') | android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_contents.cc

diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc

index 77e35efbe3cba8f86c7d48bec6d05404d65fc5ae..de9c58d5e12c9c1fcac2da14533e16c278e45f41 100644

--- a/android_webview/native/aw_contents.cc

+++ b/android_webview/native/aw_contents.cc

@@ -310,10 +310,10 @@ void AwContents::SetAwGLFunctor(AwGLFunctor* functor) {

}

functor_ = functor;

if (functor_) {

- browser_view_renderer_.SetCompositorFrameConsumer(

+ browser_view_renderer_.SetCurrentCompositorFrameConsumer(

functor_->GetCompositorFrameConsumer());

} else {

- browser_view_renderer_.SetCompositorFrameConsumer(nullptr);

+ browser_view_renderer_.SetCurrentCompositorFrameConsumer(nullptr);

}