Skip to content

GitLab

T
tangled
Commit 3ae903f2 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot
Browse files
Options

android: minor cleanup of TabImpl 

Removes unnecessary jni args.

BUG=none
TEST=none

Change-Id: I19444fe8736577ac4544b0f3773ec20ffd678fcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2538284Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827543}
parent 993ca5b6
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 54 deletions
chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
View file @ 3ae903f2
......@@ -452,9 +452,9 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
// We load the URL from the tab rather than directly from the ContentView so the tab has
// a chance of using a prerenderer page is any.
int loadType = TabImplJni.get().loadUrl(mNativeTabAndroid, TabImpl.this,
params.getUrl(), params.getInitiatorOrigin(), params.getVerbatimHeaders(),
params.getPostData(), params.getTransitionType(),
int loadType = TabImplJni.get().loadUrl(mNativeTabAndroid, params.getUrl(),
params.getInitiatorOrigin(), params.getVerbatimHeaders(), params.getPostData(),
params.getTransitionType(),
params.getReferrer() != null ? params.getReferrer().getUrl() : null,
// Policy will be ignored for null referrer url, 0 is just a placeholder.
// TODO(ppi): Should we pass Referrer jobject and add JNI methods to read it
......@@ -680,7 +680,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
// destroying the native tab cleanups up any remaining infobars. The infobar container
// expects all infobars to be cleaned up before its own destruction.
if (mNativeTabAndroid != 0) {
TabImplJni.get().destroy(mNativeTabAndroid, TabImpl.this);
TabImplJni.get().destroy(mNativeTabAndroid);
assert mNativeTabAndroid == 0;
}
}
......@@ -1029,8 +1029,8 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
*/
void pushNativePageStateToNavigationEntry() {
assert mNativeTabAndroid != 0 && getNativePage() != null;
TabImplJni.get().setActiveNavigationEntryTitleForUrl(mNativeTabAndroid, TabImpl.this,
getNativePage().getUrl(), getNativePage().getTitle());
TabImplJni.get().setActiveNavigationEntryTitleForUrl(
mNativeTabAndroid, getNativePage().getUrl(), getNativePage().getTitle());
}
/**
......@@ -1063,7 +1063,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
*/
void loadOriginalImage() {
if (mNativeTabAndroid != 0) {
TabImplJni.get().loadOriginalImage(mNativeTabAndroid, TabImpl.this);
TabImplJni.get().loadOriginalImage(mNativeTabAndroid);
}
}
......@@ -1198,7 +1198,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
if (bounds != null) {
assert mNativeTabAndroid != 0;
TabImplJni.get().onPhysicalBackingSizeChanged(
mNativeTabAndroid, TabImpl.this, webContents, bounds.right, bounds.bottom);
mNativeTabAndroid, webContents, bounds.right, bounds.bottom);
}
webContents.onShow();
initWebContents(webContents);
......@@ -1287,8 +1287,8 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
mWebContentsDelegate = createWebContentsDelegate();
assert mNativeTabAndroid != 0;
TabImplJni.get().initWebContents(mNativeTabAndroid, TabImpl.this, mIncognito,
isDetached(this), webContents, mSourceTabId, mWebContentsDelegate,
TabImplJni.get().initWebContents(mNativeTabAndroid, mIncognito, isDetached(this),
webContents, mSourceTabId, mWebContentsDelegate,
new TabContextMenuPopulatorFactory(
mDelegateFactory.createContextMenuPopulatorFactory(this), this));
......@@ -1352,7 +1352,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
WebContents webContents = getWebContents();
if (webContents != null) {
TabImplJni.get().updateDelegates(mNativeTabAndroid, TabImpl.this, mWebContentsDelegate,
TabImplJni.get().updateDelegates(mNativeTabAndroid, mWebContentsDelegate,
new TabContextMenuPopulatorFactory(
mDelegateFactory.createContextMenuPopulatorFactory(this), this));
webContents.notifyRendererPreferenceUpdate();
......@@ -1520,9 +1520,9 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
if (deleteNativeWebContents) {
// Destruction of the native WebContents will call back into Java to destroy the Java
// WebContents.
TabImplJni.get().destroyWebContents(mNativeTabAndroid, TabImpl.this);
TabImplJni.get().destroyWebContents(mNativeTabAndroid);
} else {
TabImplJni.get().releaseWebContents(mNativeTabAndroid, TabImpl.this);
TabImplJni.get().releaseWebContents(mNativeTabAndroid);
// Since the native WebContents is still alive, we need to clear its reference to the
// Java WebContents. While doing so, it will also call back into Java to destroy the
// Java WebContents.
......@@ -1534,27 +1534,24 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
interface Natives {
TabImpl fromWebContents(WebContents webContents);
void init(TabImpl caller);
void destroy(long nativeTabAndroid, TabImpl caller);
void initWebContents(long nativeTabAndroid, TabImpl caller, boolean incognito,
boolean isBackgroundTab, WebContents webContents, int parentTabId,
void destroy(long nativeTabAndroid);
void initWebContents(long nativeTabAndroid, boolean incognito, boolean isBackgroundTab,
WebContents webContents, int parentTabId,
TabWebContentsDelegateAndroidImpl delegate,
ContextMenuPopulatorFactory contextMenuPopulatorFactory);
void updateDelegates(long nativeTabAndroid, TabImpl caller,
TabWebContentsDelegateAndroidImpl delegate,
void updateDelegates(long nativeTabAndroid, TabWebContentsDelegateAndroidImpl delegate,
ContextMenuPopulatorFactory contextMenuPopulatorFactory);
void destroyWebContents(long nativeTabAndroid, TabImpl caller);
void releaseWebContents(long nativeTabAndroid, TabImpl caller);
void onPhysicalBackingSizeChanged(long nativeTabAndroid, TabImpl caller,
WebContents webContents, int width, int height);
int loadUrl(long nativeTabAndroid, TabImpl caller, String url, Origin initiatorOrigin,
String extraHeaders, ResourceRequestBody postData, int transition,
String referrerUrl, int referrerPolicy, boolean isRendererInitiated,
boolean shoulReplaceCurrentEntry, boolean hasUserGesture,
boolean shouldClearHistoryList, long inputStartTimestamp,
void destroyWebContents(long nativeTabAndroid);
void releaseWebContents(long nativeTabAndroid);
void onPhysicalBackingSizeChanged(
long nativeTabAndroid, WebContents webContents, int width, int height);
int loadUrl(long nativeTabAndroid, String url, Origin initiatorOrigin, String extraHeaders,
ResourceRequestBody postData, int transition, String referrerUrl,
int referrerPolicy, boolean isRendererInitiated, boolean shoulReplaceCurrentEntry,
boolean hasUserGesture, boolean shouldClearHistoryList, long inputStartTimestamp,
long intentReceivedTimestamp);
void setActiveNavigationEntryTitleForUrl(
long nativeTabAndroid, TabImpl caller, String url, String title);
void loadOriginalImage(long nativeTabAndroid, TabImpl caller);
void setActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title);
void loadOriginalImage(long nativeTabAndroid);
void setAddApi2TransitionToFutureNavigations(long nativeTabAndroid, boolean shouldAdd);
boolean getAddApi2TransitionToFutureNavigations(long nativeTabAndroid);
void setHideFutureNavigations(long nativeTabAndroid, boolean hide);
......
chrome/browser/android/tab_android.cc
View file @ 3ae903f2
......@@ -240,13 +240,12 @@ void TabAndroid::RemoveObserver(Observer* observer) {
observers_.RemoveObserver(observer);
}
void TabAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
void TabAndroid::Destroy(JNIEnv* env) {
delete this;
}
void TabAndroid::InitWebContents(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean incognito,
jboolean is_background_tab,
const JavaParamRef<jobject>& jweb_contents,
......@@ -292,7 +291,6 @@ void TabAndroid::InitWebContents(
void TabAndroid::UpdateDelegates(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& jweb_contents_delegate,
const JavaParamRef<jobject>& jcontext_menu_populator_factory) {
ContextMenuHelper::FromWebContents(web_contents())
......@@ -314,8 +312,7 @@ void WillRemoveWebContentsFromTab(content::WebContents* contents) {
}
} // namespace
void TabAndroid::DestroyWebContents(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
void TabAndroid::DestroyWebContents(JNIEnv* env) {
WillRemoveWebContentsFromTab(web_contents());
// Terminate the renderer process if this is the last tab.
......@@ -335,8 +332,7 @@ void TabAndroid::DestroyWebContents(JNIEnv* env,
synced_tab_delegate_->ResetWebContents();
}
void TabAndroid::ReleaseWebContents(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
void TabAndroid::ReleaseWebContents(JNIEnv* env) {
WillRemoveWebContentsFromTab(web_contents());
// Ownership of |released_contents| is assumed by the code that initiated the
......@@ -352,7 +348,6 @@ void TabAndroid::ReleaseWebContents(JNIEnv* env,
void TabAndroid::OnPhysicalBackingSizeChanged(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& jweb_contents,
jint width,
jint height) {
......@@ -364,7 +359,6 @@ void TabAndroid::OnPhysicalBackingSizeChanged(
TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& url,
const JavaParamRef<jobject>& j_initiator_origin,
const JavaParamRef<jstring>& j_extra_headers,
......@@ -441,7 +435,6 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
void TabAndroid::SetActiveNavigationEntryTitleForUrl(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jstring>& jurl,
const JavaParamRef<jstring>& jtitle) {
DCHECK(web_contents());
......@@ -460,8 +453,7 @@ void TabAndroid::SetActiveNavigationEntryTitleForUrl(
entry->SetTitle(title);
}
void TabAndroid::LoadOriginalImage(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
void TabAndroid::LoadOriginalImage(JNIEnv* env) {
content::RenderFrameHost* render_frame_host =
web_contents()->GetFocusedFrame();
mojo::AssociatedRemote<chrome::mojom::ChromeRenderFrame> renderer;
......
chrome/browser/android/tab_android.h
View file @ 3ae903f2
......@@ -128,10 +128,9 @@ class TabAndroid : public base::SupportsUserData {
// Methods called from Java via JNI -----------------------------------------
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
void Destroy(JNIEnv* env);
void InitWebContents(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
jboolean incognito,
jboolean is_background_tab,
const base::android::JavaParamRef<jobject>& jweb_contents,
......@@ -141,23 +140,18 @@ class TabAndroid : public base::SupportsUserData {
jcontext_menu_populator_factory);
void UpdateDelegates(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
const base::android::JavaParamRef<jobject>&
jcontext_menu_populator_factory);
void DestroyWebContents(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
void ReleaseWebContents(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
void DestroyWebContents(JNIEnv* env);
void ReleaseWebContents(JNIEnv* env);
void OnPhysicalBackingSizeChanged(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jobject>& jweb_contents,
jint width,
jint height);
TabLoadStatus LoadUrl(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_initiator_origin,
const base::android::JavaParamRef<jstring>& j_extra_headers,
......@@ -173,12 +167,10 @@ class TabAndroid : public base::SupportsUserData {
jlong intent_received_timestamp);
void SetActiveNavigationEntryTitleForUrl(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jstring>& jurl,
const base::android::JavaParamRef<jstring>& jtitle);
void LoadOriginalImage(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
void LoadOriginalImage(JNIEnv* env);
void SetAddApi2TransitionToFutureNavigations(JNIEnv* env,
jboolean should_add);
jboolean GetAddApi2TransitionToFutureNavigations(JNIEnv* env) {
......
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