| commit | 6a37bcd1ea67b845dad88a52d48273d1c223a97a | [log] [tgz] |
|---|---|---|
| author | Andrew Grieve <[email protected]> | Thu Sep 26 21:47:44 2024 |
| committer | Chromium LUCI CQ <[email protected]> | Thu Sep 26 21:47:44 2024 |
| tree | 8b61b1b14076be8bc0c55b2526f320ec9d8c6c06 | |
| parent | 2204b955fc7b1643578f200d2f8e9fdd5942d628 [diff] [blame] |
Android: Use @JniType in WarmupManager.java * Adds @JniType conversions for WebContents and Origin * Removes a heap allocation of FromJavaObject Bug: 326465150 Change-Id: I3e8a7b338284d10ded6da5035f4839eb1ce40206 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5891481 Commit-Queue: Andrew Grieve <[email protected]> Reviewed-by: Mohamed Heikal <[email protected]> Owners-Override: Andrew Grieve <[email protected]> Cr-Commit-Position: refs/heads/main@{#1360771}
diff --git a/components/navigation_interception/intercept_navigation_delegate.cc b/components/navigation_interception/intercept_navigation_delegate.cc index 02f99bb..6ecad95d 100644 --- a/components/navigation_interception/intercept_navigation_delegate.cc +++ b/components/navigation_interception/intercept_navigation_delegate.cc
@@ -251,7 +251,7 @@ Java_InterceptNavigationDelegate_handleSubframeExternalProtocol( env, jdelegate, url::GURLAndroid::FromNativeGURL(env, escaped_url), page_transition, has_user_gesture, - initiating_origin ? initiating_origin->ToJavaObject() : nullptr); + initiating_origin ? initiating_origin->ToJavaObject(env) : nullptr); if (j_gurl.is_null()) return; subframe_redirect_url_ =