android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java - Issue 1914433002: Assert that AwGLFunctor instances do not leak.

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/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

Issue 1914433002: Assert that AwGLFunctor instances do not leak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java ('k') | android_webview/native/aw_gl_functor.cc » ('j') | android_webview/native/aw_gl_functor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

index 1166cac0e8ac198fb928488790ee5e6df8bafbf8..9eac3fe0cacb1b70a69aaceb844d099c82b439d4 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

@@ -13,6 +13,7 @@ import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.android_webview.AwContents;

+import org.chromium.android_webview.AwGLFunctor;

import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.test.util.Feature;

import org.chromium.content.browser.test.util.Criteria;

@@ -237,8 +238,9 @@ public class AwContentsGarbageCollectionTest extends AwTestBase {

return runTestOnUiThreadAndGetResult(new Callable<Boolean>() {

@Override

public Boolean call() {

- int count = AwContents.getNativeInstanceCount();

- return count <= MAX_IDLE_INSTANCES;

+ int count_awc = AwContents.getNativeInstanceCount();

+ int count_awglf = AwGLFunctor.getNativeInstanceCount();

+ return count_awc <= MAX_IDLE_INSTANCES && count_awglf <= count_awc;

boliu 2016/04/22 15:51:53 second half is never going to true, for now anyway

}

});

} catch (Exception e) {