From e23bbc49196b52b39ca76c99734b841d6793a3dd Mon Sep 17 00:00:00 2001 From: uazo Date: Thu, 3 Nov 2022 11:40:00 +0000 Subject: [PATCH] AUTOMATED - git apply results --- .../patches/Enable-native-Android-autofill.patch | 15 ++++++++------- build/patches/Move-navigation-bar-to-bottom.patch | 2 +- build/patches/User-agent-customization.patch | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index 27c01526..8ea690b7 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Creates an instance of a {@link TabImpl}. * -@@ -759,6 +772,11 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -775,6 +788,11 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { for (TabObserver observer : mObservers) observer.onDestroyed(this); mObservers.clear(); @@ -230,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mUserDataHost.destroy(); mTabViewManager.destroy(); hideNativePage(false, null); -@@ -1340,6 +1358,16 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1356,6 +1374,16 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { return tabsPtrArray; } @@ -247,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Initializes the {@link WebContents}. Completes the browser content components initialization * around a native WebContents pointer. -@@ -1389,6 +1417,27 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1405,6 +1433,27 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { mDelegateFactory.createContextMenuPopulatorFactory(this), this)); mWebContents.notifyRendererPreferenceUpdate(); @@ -275,11 +275,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav TabHelpers.initWebContentsHelpers(this); notifyContentChanged(); } finally { -@@ -1725,5 +1774,6 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1742,6 +1791,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { void setActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title); void loadOriginalImage(long nativeTabAndroid); boolean handleNonNavigationAboutURL(GURL url); + void initializeAutofillIfNecessary(long nativeTabAndroid); + void onShow(long nativeTabAndroid); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java @@ -331,7 +332,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc -@@ -69,6 +69,13 @@ +@@ -70,6 +70,13 @@ #include "url/android/gurl_android.h" #include "url/gurl.h" @@ -345,7 +346,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_ using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; using base::android::JavaParamRef; -@@ -470,3 +477,19 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef& obj) { +@@ -505,3 +512,19 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef& obj) { // This will automatically bind to the Java object and pass ownership there. new TabAndroid(env, obj); } @@ -368,7 +369,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_ diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h --- a/chrome/browser/android/tab_android.h +++ b/chrome/browser/android/tab_android.h -@@ -160,6 +160,8 @@ class TabAndroid : public base::SupportsUserData { +@@ -162,6 +162,8 @@ class TabAndroid : public base::SupportsUserData { void SetDevToolsAgentHost(scoped_refptr host); diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index 0f6304cb..e2db9d0a 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -2491,7 +2491,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/layers/layer.h" #include "cc/layers/surface_layer.h" -@@ -462,6 +463,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -474,6 +475,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. float top_content_offset = metadata.top_controls_height * metadata.top_controls_shown_ratio; diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 21a4c8c9..93d2dabb 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -575,7 +575,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav @TabLoadStatus int result = loadUrlInternal(params, fixedUrl); -@@ -1402,8 +1432,15 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1418,8 +1448,15 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { mWebContents.setImportance(mImportance); @@ -593,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mContentView.addOnAttachStateChangeListener(mAttachStateChangeListener); updateInteractableState(); -@@ -1561,6 +1598,10 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1577,6 +1614,10 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { if (mWebContents != null) mWebContents.getNavigationController().loadIfNecessary(); mIsBeingRestored = true; for (TabObserver observer : mObservers) observer.onRestoreStarted(this); @@ -604,7 +604,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav } finally { TraceEvent.end("Tab.restoreIfNeeded"); } -@@ -1697,6 +1738,13 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1713,6 +1754,13 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { } private @UserAgentOverrideOption int calculateUserAgentOverrideOption(@Nullable GURL url) { @@ -618,7 +618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav WebContents webContents = getWebContents(); boolean currentRequestDesktopSite = TabUtils.isUsingDesktopUserAgent(webContents); @TabUserAgent -@@ -1757,6 +1805,43 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { +@@ -1773,6 +1821,43 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { /* forcedByUser */ false, caller); } @@ -660,8 +660,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav + } + @NativeMethods - interface Natives { - TabImpl fromWebContents(WebContents webContents); + @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) + public interface Natives { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java