content/browser/renderer_host/compositor_impl_android.cc - Issue 14017019: browser: Fix null ANativeWindow reference.

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/renderer_host/compositor_impl_android.cc

Issue 14017019: browser: Fix null ANativeWindow reference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 8 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:

Index: content/browser/renderer_host/compositor_impl_android.cc

diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc

index 78d6834a5ed77ad6b162d679dc31ab91d1cb29bd..b1578fdd5a942b041f3482c24be7a94ca7036bfd 100644

--- a/content/browser/renderer_host/compositor_impl_android.cc

+++ b/content/browser/renderer_host/compositor_impl_android.cc

@@ -163,8 +163,10 @@ void CompositorImpl::SetWindowSurface(ANativeWindow* window) {

void CompositorImpl::SetSurface(jobject surface) {

JNIEnv* env = base::android::AttachCurrentThread();

base::android::ScopedJavaLocalRef<jobject> j_surface(env, surface);

- if (surface) {

- ANativeWindow* window = ANativeWindow_fromSurface(env, surface);

+ ANativeWindow* window = NULL;

+ if (surface)

+ window = ANativeWindow_fromSurface(env, surface);

+ if (window) {

SetWindowSurface(window);

ANativeWindow_release(window);

{

« no previous file with comments | « no previous file | no next file » | no next file with comments »