-
-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update/port patches for 127.0.6533.103.0
- Loading branch information
1 parent
f0577a9
commit 133dbc8
Showing
183 changed files
with
261 additions
and
180 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
patches/0007-enable-stack-clash-protection-for-arm64-targets.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: fgei <fgei@gmail.com> | ||
Date: Wed, 31 Jul 2024 12:35:24 +0000 | ||
Subject: [PATCH] enable stack clash protection for arm64 targets | ||
|
||
--- | ||
build/config/compiler/BUILD.gn | 4 ++++ | ||
1 file changed, 4 insertions(+) | ||
|
||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
index f598fd188a4ce..d8e9203096789 100644 | ||
--- a/build/config/compiler/BUILD.gn | ||
+++ b/build/config/compiler/BUILD.gn | ||
@@ -371,6 +371,10 @@ config("compiler") { | ||
} | ||
} | ||
|
||
+ if (target_cpu == "arm64") { | ||
+ cflags += [ "-fstack-clash-protection" ] | ||
+ } | ||
+ | ||
if (use_lld) { | ||
ldflags += [ "-fuse-ld=lld" ] | ||
if (lld_path != "") { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
59 changes: 0 additions & 59 deletions
59
patches/0108-Extend-opening-links-from-external-apps-in-incognito.patch
This file was deleted.
Oops, something went wrong.
File renamed without changes.
100 changes: 36 additions & 64 deletions
100
patches/0109-Extend-opening-links-from-external-apps-in-incognito.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,87 +1,59 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: fgei <fgei@gmail.com> | ||
Date: Thu, 1 Feb 2024 17:58:40 +0000 | ||
Date: Thu, 1 Feb 2024 17:58:19 +0000 | ||
Subject: [PATCH] Extend opening links from external apps in incognito for | ||
search tabs | ||
custom tabs | ||
|
||
--- | ||
.../chromium/chrome/browser/LaunchIntentDispatcher.java | 2 ++ | ||
.../chrome/browser/LaunchIntentDispatcherHooks.java | 6 ++++++ | ||
.../chrome/browser/searchwidget/SearchActivity.java | 6 +++++- | ||
.../chrome/browser/searchwidget/SearchActivityHooks.java | 7 +++++++ | ||
4 files changed, 20 insertions(+), 1 deletion(-) | ||
.../chrome/browser/LaunchIntentDispatcher.java | 1 + | ||
.../browser/LaunchIntentDispatcherHooks.java | 17 +++++++++++++++++ | ||
2 files changed, 18 insertions(+) | ||
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java | ||
index 97fb584f0ec86..5f059ef6ff070 100644 | ||
index fe9bbd148b60c..97fb584f0ec86 100644 | ||
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java | ||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java | ||
@@ -221,6 +221,8 @@ public class LaunchIntentDispatcher { | ||
searchActivityIntent.setClass( | ||
ContextUtils.getApplicationContext(), SearchActivity.class); | ||
searchActivityIntent.putExtra(SearchManager.QUERY, query); | ||
+ searchActivityIntent = LaunchIntentDispatcherHooks.maybeModifySearchIntents( | ||
+ mActivity, searchActivityIntent); | ||
mActivity.startActivity(searchActivityIntent); | ||
} | ||
return true; | ||
@@ -261,6 +261,7 @@ public class LaunchIntentDispatcher { | ||
newIntent.setAction(Intent.ACTION_VIEW); | ||
newIntent.setData(uri); | ||
newIntent.setClassName(context, CustomTabActivity.class.getName()); | ||
+ newIntent = LaunchIntentDispatcherHooks.maybeModifyCustomTabIntents(context, newIntent); | ||
|
||
// Since configureIntentForResizableCustomTab() might change the componenet/class | ||
// associated with the passed intent, it needs to be called after #setClassName(context, | ||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java | ||
index c282d5311d57f..6cdfa50279aa0 100644 | ||
index aaec00177de6e..c282d5311d57f 100644 | ||
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java | ||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java | ||
@@ -29,4 +29,10 @@ final class LaunchIntentDispatcherHooks { | ||
@@ -1,9 +1,20 @@ | ||
package org.chromium.chrome.browser; | ||
|
||
return newIntent; | ||
} | ||
import android.app.Activity; | ||
+import android.content.Context; | ||
import android.content.Intent; | ||
|
||
final class LaunchIntentDispatcherHooks { | ||
+ | ||
+ static Intent maybeModifySearchIntents(Activity activity, Intent intent) { | ||
+ Intent newIntent = maybeCreateIncognitoTabIntentFor(activity, intent); | ||
+ private static Intent maybeCreateIncognitoTabIntentFor(Context context, Intent intent) { | ||
+ Intent newIntent = intent; | ||
+ if (TabPreferencesUtils.shouldOpenLinksInIncognito()) { | ||
+ newIntent = TabPreferencesUtils.appendNeededIncognitoExtras(context, newIntent); | ||
+ } | ||
+ | ||
+ return newIntent; | ||
+ } | ||
} | ||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java | ||
index a2a066322d4b2..86831f34543a4 100644 | ||
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java | ||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java | ||
@@ -469,13 +469,17 @@ public class SearchActivity extends AsyncInitializationActivity | ||
@Nullable | ||
@Override | ||
protected OTRProfileID createOffTheRecordProfileID() { | ||
+ if (SearchActivityHooks.shouldOpenInIncognito(getIntent())) { | ||
+ return super.createOffTheRecordProfileID(); | ||
+ } | ||
throw new IllegalStateException( | ||
"Attempting to access incognito from the search activity"); | ||
} | ||
}; | ||
profileProvider.onAvailable( | ||
(provider) -> { | ||
- mProfileSupplier.set(profileProvider.get().getOriginalProfile()); | ||
+ mProfileSupplier.set(ProfileProvider.getOrCreateProfile(profileProvider.get(), | ||
+ SearchActivityHooks.shouldOpenInIncognito(getIntent()))); | ||
}); | ||
return profileProvider; | ||
} | ||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java | ||
index 791a9ed59a2f3..bbc7996c25aaf 100644 | ||
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java | ||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java | ||
@@ -3,6 +3,8 @@ package org.chromium.chrome.browser.searchwidget; | ||
import android.app.Activity; | ||
import android.content.Intent; | ||
|
||
+import org.chromium.base.IntentUtils; | ||
+import org.chromium.chrome.browser.IntentHandler; | ||
import org.chromium.chrome.browser.TabPreferencesUtils; | ||
import org.chromium.chrome.browser.omnibox.LocationBarCoordinator; | ||
|
||
@@ -20,4 +22,9 @@ public class SearchActivityHooks { | ||
+ | ||
static Intent maybeModifyActionViewIntents(Activity activity, Intent intent) { | ||
Intent newIntent = intent; | ||
if (TabPreferencesUtils.shouldOpenLinksInIncognito()) { | ||
@@ -12,4 +23,10 @@ final class LaunchIntentDispatcherHooks { | ||
|
||
return newIntent; | ||
} | ||
+ | ||
+ static boolean shouldOpenInIncognito(Intent intent) { | ||
+ return IntentUtils.safeGetBooleanExtra(intent, | ||
+ IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false); | ||
+ static Intent maybeModifyCustomTabIntents(Context context, Intent intent) { | ||
+ Intent newIntent = maybeCreateIncognitoTabIntentFor(context, intent); | ||
+ | ||
+ return newIntent; | ||
+ } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.