Removed all is_null check before calling any CalledByNative JNI functions.

BUG=None

Review URL: https://codereview.chromium.org/363563005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284776 0039d316-1c4b-4281-b951-d872f2087c98
parent c9167828
...@@ -111,11 +111,7 @@ TabAndroid::TabAndroid(JNIEnv* env, jobject obj) ...@@ -111,11 +111,7 @@ TabAndroid::TabAndroid(JNIEnv* env, jobject obj)
TabAndroid::~TabAndroid() { TabAndroid::~TabAndroid() {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env); Java_Tab_clearNativePtr(env, weak_java_tab_.get(env).obj());
if (obj.is_null())
return;
Java_Tab_clearNativePtr(env, obj.obj());
} }
base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() { base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() {
...@@ -125,44 +121,29 @@ base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() { ...@@ -125,44 +121,29 @@ base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() {
int TabAndroid::GetAndroidId() const { int TabAndroid::GetAndroidId() const {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env); return Java_Tab_getId(env, weak_java_tab_.get(env).obj());
if (obj.is_null())
return -1;
return Java_Tab_getId(env, obj.obj());
} }
int TabAndroid::GetSyncId() const { int TabAndroid::GetSyncId() const {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env); return Java_Tab_getSyncId(env, weak_java_tab_.get(env).obj());
if (obj.is_null())
return 0;
return Java_Tab_getSyncId(env, obj.obj());
} }
base::string16 TabAndroid::GetTitle() const { base::string16 TabAndroid::GetTitle() const {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
if (obj.is_null())
return base::string16();
return base::android::ConvertJavaStringToUTF16( return base::android::ConvertJavaStringToUTF16(
Java_Tab_getTitle(env, obj.obj())); Java_Tab_getTitle(env, weak_java_tab_.get(env).obj()));
} }
GURL TabAndroid::GetURL() const { GURL TabAndroid::GetURL() const {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
if (obj.is_null())
return GURL::EmptyGURL();
return GURL(base::android::ConvertJavaStringToUTF8( return GURL(base::android::ConvertJavaStringToUTF8(
Java_Tab_getUrl(env, obj.obj()))); Java_Tab_getUrl(env, weak_java_tab_.get(env).obj())));
} }
bool TabAndroid::LoadIfNeeded() { bool TabAndroid::LoadIfNeeded() {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env); return Java_Tab_loadIfNeeded(env, weak_java_tab_.get(env).obj());
if (obj.is_null())
return false;
return Java_Tab_loadIfNeeded(env, obj.obj());
} }
content::ContentViewCore* TabAndroid::GetContentViewCore() const { content::ContentViewCore* TabAndroid::GetContentViewCore() const {
...@@ -196,10 +177,7 @@ void TabAndroid::SetWindowSessionID(SessionID::id_type window_id) { ...@@ -196,10 +177,7 @@ void TabAndroid::SetWindowSessionID(SessionID::id_type window_id) {
void TabAndroid::SetSyncId(int sync_id) { void TabAndroid::SetSyncId(int sync_id) {
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env); Java_Tab_setSyncId(env, weak_java_tab_.get(env).obj(), sync_id);
if (obj.is_null())
return;
Java_Tab_setSyncId(env, obj.obj(), sync_id);
} }
void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) { void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment