summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-06 16:05:33 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-06 16:05:33 +0000
commit7dc1fb2cbc0795955535242338eaf63a20229a26 (patch)
tree19b679d1a2ee56cfe4b9f667c10fc28530094335
parent7a6fb6173451e047c521119d4ad24ff324b44986 (diff)
downloadchromium_src-7dc1fb2cbc0795955535242338eaf63a20229a26.zip
chromium_src-7dc1fb2cbc0795955535242338eaf63a20229a26.tar.gz
chromium_src-7dc1fb2cbc0795955535242338eaf63a20229a26.tar.bz2
Merge 266398 "[Android] Delete local java reference every loop."
> [Android] Delete local java reference every loop. > > In ForeignSessionHelper class, there were two places > we allocate ScopedJavaLocalRef<jstring> inside a loop and > doesn't delete. The Java local references are cleaned upon > returning to Java, but there is 512 local reference hard-limit > so we should delete it every loop to avoid hitting the limit. > > BUG=366659 > > Review URL: https://codereview.chromium.org/257513007 TBR=kkimlabs@chromium.org Review URL: https://codereview.chromium.org/270153003 git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@268527 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/android/foreign_session_helper.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/android/foreign_session_helper.cc b/chrome/browser/android/foreign_session_helper.cc
index 38d7c1c..f1b3565 100644
--- a/chrome/browser/android/foreign_session_helper.cc
+++ b/chrome/browser/android/foreign_session_helper.cc
@@ -106,8 +106,8 @@ void CopyTabsToJava(
Java_ForeignSessionHelper_pushTab(
env, j_window.obj(),
- ConvertUTF8ToJavaString(env, tab_url.spec()).Release(),
- ConvertUTF16ToJavaString(env, current_navigation.title()).Release(),
+ ConvertUTF8ToJavaString(env, tab_url.spec()).obj(),
+ ConvertUTF16ToJavaString(env, current_navigation.title()).obj(),
session_tab.timestamp.ToJavaTime(),
session_tab.tab_id.id());
}
@@ -236,8 +236,8 @@ jboolean ForeignSessionHelper::GetForeignSessions(JNIEnv* env,
Java_ForeignSessionHelper_pushSession(
env,
result,
- ConvertUTF8ToJavaString(env, session.session_tag).Release(),
- ConvertUTF8ToJavaString(env, session.session_name).Release(),
+ ConvertUTF8ToJavaString(env, session.session_tag).obj(),
+ ConvertUTF8ToJavaString(env, session.session_name).obj(),
session.device_type,
session.modified_time.ToJavaTime()));