From f84fec5c2f48b4f1d32d3f3d20cbc90fbe15b809 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 7 Aug 2023 14:38:53 +0200 Subject: [PATCH] v116 modified patches --- ...d-setting-to-invert-tap-and-long-tap.patch | 81 ++++++++++++++++--- .../patches/00Keyboard-protection-flag.patch | 17 +++- .../Add-menu-item-to-bookmark-all-tabs.patch | 13 ++- build/patches/Disable-all-promo-dialogs.patch | 14 +++- .../Disable-conversion-measurement-api.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 16 +++- ...prove-plain-text-rendering-on-mobile.patch | 4 +- build/patches/User-agent-customization.patch | 17 ++-- .../eyeo-beta-114.0.5735.53-v1-base.patch | 25 +++--- ...ed-chromium-no-special-hosts-domains.patch | 36 ++++++--- 10 files changed, 172 insertions(+), 53 deletions(-) diff --git a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch index 2c153ca4..e43277df 100644 --- a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch @@ -6,7 +6,7 @@ Reverses single tap to long tap in android for accessibility reasons. The feature can be activated from the accessibility settings. --- chrome/android/java/res/values/ids.xml | 1 + - .../ChromeAccessibilitySettingsDelegate.java | 18 +++++++++++ + .../ChromeAccessibilitySettingsDelegate.java | 18 ++++++++++ .../contextmenu/ChromeContextMenuItem.java | 5 ++- .../ChromeContextMenuPopulator.java | 5 +++ .../tab/TabContextMenuItemDelegate.java | 8 +++++ @@ -16,19 +16,19 @@ The feature can be activated from the accessibility settings. chrome/browser/flag_descriptions.h | 3 ++ .../flags/android/chrome_feature_list.cc | 1 + .../browser/flags/ChromeFeatureList.java | 5 +++ - .../strings/android_chrome_strings.grd | 9 ++++++ + .../strings/android_chrome_strings.grd | 9 +++++ .../res/xml/accessibility_preferences.xml | 5 +++ - .../accessibility/AccessibilitySettings.java | 11 +++++++ + .../accessibility/AccessibilitySettings.java | 11 ++++++ .../AccessibilitySettingsDelegate.java | 2 ++ third_party/blink/common/features.cc | 4 +++ third_party/blink/public/common/features.h | 2 ++ - .../renderer/core/html/html_anchor_element.cc | 12 ++++++- - .../renderer/core/html/html_anchor_element.h | 2 +- - .../renderer/core/html/html_image_element.cc | 17 ++++++++++ + .../renderer/core/html/html_anchor_element.cc | 35 +++++++++++++++---- + .../renderer/core/html/html_anchor_element.h | 9 +++-- + .../renderer/core/html/html_image_element.cc | 17 +++++++++ .../renderer/core/html/html_image_element.h | 2 ++ - .../core/page/context_menu_controller.cc | 32 +++++++++++++------ + .../core/page/context_menu_controller.cc | 32 ++++++++++++----- .../core/page/context_menu_controller.h | 5 +-- - 23 files changed, 146 insertions(+), 14 deletions(-) + 23 files changed, 170 insertions(+), 20 deletions(-) diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml --- a/chrome/android/java/res/values/ids.xml @@ -365,7 +365,25 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third #include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -489,6 +490,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request, +@@ -436,6 +437,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request, + bool is_trusted, + base::TimeTicks platform_time_stamp, + KURL completed_url) { ++ UIEvent& event = *UIEvent::Create(); ++ NavigateToHyperlink2(std::move(request), navigation_policy, is_trusted, platform_time_stamp, ++ std::move(completed_url), event, true); ++} ++ ++void HTMLAnchorElement::NavigateToHyperlink2(ResourceRequest request, ++ NavigationPolicy navigation_policy, ++ bool is_trusted, ++ base::TimeTicks platform_time_stamp, ++ KURL completed_url, ++ Event& event, bool do_not_show_context_menu) { + LocalDOMWindow* window = GetDocument().domWindow(); + if (!window) { + return; +@@ -489,6 +501,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request, /*element=*/this)); } @@ -381,7 +399,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third Frame* target_frame = frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame; -@@ -508,7 +518,7 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request, +@@ -508,7 +529,7 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request, } } @@ -390,6 +408,34 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third event.SetDefaultHandled(); LocalDOMWindow* window = GetDocument().domWindow(); +@@ -607,12 +628,12 @@ void HTMLAnchorElement::HandleClick(Event& event) { + } + + NavigationPolicy navigation_policy = NavigationPolicyFromEvent(&event); +- base::OnceClosure navigate_closure = WTF::BindOnce( +- &HTMLAnchorElement::NavigateToHyperlink, WrapWeakPersistent(this), +- std::move(request), navigation_policy, event.isTrusted(), +- event.PlatformTimeStamp(), std::move(completed_url)); + + if (navigation_policy == kNavigationPolicyDownload) { ++ base::OnceClosure navigate_closure = WTF::BindOnce( ++ &HTMLAnchorElement::NavigateToHyperlink, WrapWeakPersistent(this), ++ std::move(request), navigation_policy, event.isTrusted(), ++ event.PlatformTimeStamp(), std::move(completed_url)); + // If Alt is held down it will force a download, however, wait to see if + // this is an alt-double-click which should instead select the text of the + // link. +@@ -624,7 +645,9 @@ void HTMLAnchorElement::HandleClick(Event& event) { + frame->GetEventHandler().SetDownloadModifierTaskHandle( + std::move(task_handle)); + } else { +- std::move(navigate_closure).Run(); ++ HTMLAnchorElement::NavigateToHyperlink2(std::move(request), navigation_policy, ++ event.isTrusted(), event.PlatformTimeStamp(), std::move(completed_url), ++ event, do_not_show_context_menu); + } + } + diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_party/blink/renderer/core/html/html_anchor_element.h --- a/third_party/blink/renderer/core/html/html_anchor_element.h +++ b/third_party/blink/renderer/core/html/html_anchor_element.h @@ -401,11 +447,22 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_ protected: void ParseAttribute(const AttributeModificationParams&) override; -@@ -127,7 +128,6 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils { +@@ -122,12 +123,16 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils { + bool IsInteractiveContent() const final; + InsertionNotificationRequest InsertedInto(ContainerNode&) override; + void RemovedFrom(ContainerNode&) override; ++ void NavigateToHyperlink2(ResourceRequest, ++ NavigationPolicy, ++ bool is_trusted, ++ base::TimeTicks platform_time_stamp, ++ KURL, Event&, bool do_not_show_context_menu); + void NavigateToHyperlink(ResourceRequest, + NavigationPolicy, bool is_trusted, base::TimeTicks platform_time_stamp, - KURL); +- KURL); - void HandleClick(Event&); ++ KURL completed_url); unsigned link_relations_ : 31; mutable LinkHash cached_visited_link_hash_; diff --git a/build/patches/00Keyboard-protection-flag.patch b/build/patches/00Keyboard-protection-flag.patch index d8e1985f..ab8882ca 100644 --- a/build/patches/00Keyboard-protection-flag.patch +++ b/build/patches/00Keyboard-protection-flag.patch @@ -13,10 +13,11 @@ keyboard events. .../renderer/core/events/keyboard_event.h | 3 + ui/base/ui_base_features.cc | 8 +++ ui/base/ui_base_features.h | 2 + + ui/events/event.cc | 3 +- .../dom/dom_keyboard_layout_map_win.cc | 13 ++++ .../keycodes/keyboard_code_conversion.cc | 10 ++- ui/events/keycodes/keyboard_code_conversion.h | 2 +- - 10 files changed, 113 insertions(+), 3 deletions(-) + 11 files changed, 115 insertions(+), 4 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc @@ -211,6 +212,20 @@ diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kUiCompositorScrollWithLayers); +diff --git a/ui/events/event.cc b/ui/events/event.cc +--- a/ui/events/event.cc ++++ b/ui/events/event.cc +@@ -1096,8 +1096,9 @@ char16_t KeyEvent::GetCharacter() const { + // consult the keyboard layout to retrieve the shifted character but we + // only supported US layout for this case in the past, so we only + // support this behavior. ++ int need_shit; + if (char16_t maybe_character = DomCodeToUsLayoutCharacter( +- UsLayoutDomKeyToDomCode(key_), EF_SHIFT_DOWN); ++ UsLayoutDomKeyToDomCode(key_, &need_shit), EF_SHIFT_DOWN); + maybe_character) { + shifted_character = maybe_character; + } diff --git a/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc b/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc --- a/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc +++ b/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 021cdf2c..73adcd76 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -8,7 +8,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/ChromeTabbedActivity.java | 24 ++++++++ .../browser/bookmarks/BookmarkBridge.java | 61 +++++++++++++++++++ .../browser/bookmarks/BookmarkUtils.java | 4 ++ - .../bookmarks/android/bookmark_bridge.cc | 17 ++++++ + .../bookmarks/android/bookmark_bridge.cc | 19 +++++- .../bookmarks/android/bookmark_bridge.h | 4 ++ .../browser/bookmarks/bookmark_html_writer.cc | 8 ++- .../bookmarks/chrome_bookmark_client.cc | 2 + @@ -25,7 +25,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/bookmarks/browser/bookmark_node.h | 5 ++ components/bookmarks/browser/model_loader.cc | 3 +- .../bookmark_specifics_conversions.cc | 1 + - 21 files changed, 200 insertions(+), 10 deletions(-) + 21 files changed, 201 insertions(+), 11 deletions(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml @@ -229,7 +229,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc -@@ -476,6 +476,11 @@ void BookmarkBridge::GetTopLevelFolderIds( +@@ -470,12 +470,17 @@ void BookmarkBridge::GetTopLevelFolderIds( + std::size_t special_count = top_level_folders.size(); + + if (get_normal) { +- DCHECK_EQ(4u, bookmark_model_->root_node()->children().size()); ++ DCHECK_EQ(5u, bookmark_model_->root_node()->children().size()); + for (const auto& node : bookmark_model_->mobile_node()->children()) { + if (node->is_folder()) top_level_folders.push_back(node.get()); } diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index 675a791c..4d76fe1e 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.patch @@ -4,8 +4,9 @@ Subject: Disable all promo dialogs --- .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 1 + + .../ui/views/user_education/browser_feature_promo_controller.cc | 1 + components/user_education/common/feature_promo_registry.cc | 1 + - 2 files changed, 2 insertions(+) + 3 files changed, 3 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java @@ -18,6 +19,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab // Only one promo can be shown in one run to avoid nagging users too much. if (FullScreenSyncPromoUtil.launchPromoIfNeeded(mActivity, SyncConsentActivityLauncherImpl.get(), VersionInfo.getProductMajorVersion())) { +diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc +--- a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc ++++ b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc +@@ -61,6 +61,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const { + + bool BrowserFeaturePromoController::CanShowPromo( + ui::TrackedElement* anchor_element) const { ++ if ((true)) return false; + // Temporarily turn off IPH in incognito as a concern was raised that + // the IPH backend ignores incognito and writes to the parent profile. + // See https://bugs.chromium.org/p/chromium/issues/detail?id=1128728#c30 diff --git a/components/user_education/common/feature_promo_registry.cc b/components/user_education/common/feature_promo_registry.cc --- a/components/user_education/common/feature_promo_registry.cc +++ b/components/user_education/common/feature_promo_registry.cc diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index 8169c299..129ea73f 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -345,7 +345,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib - ListenableFuture future = - mm.registerSourceAsync(Uri.parse(registrationUrl.getSpec()), event); - addRegistrationFutureCallback(requestId, RegistrationType.SOURCE, future); -+ onRegistrationCompleted(requestId, RegistrationType.SOURCE, /*success=*/false); ++ onRegistrationCompleted(requestId, RegistrationType.SOURCE, RegistrationResult.SUCCESS); } /** diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index 92e71526..7135b1d4 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -19,12 +19,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../variations/net/variations_http_headers.cc | 3 ++ .../service/variations_field_trial_creator.cc | 3 +- .../variations/service/variations_service.cc | 15 ++------- - .../browser/loader/url_loader_throttles.cc | 2 -- + .../browser/loader/url_loader_throttles.cc | 7 ---- .../origin_trials/origin_trials_utils.cc | 2 +- content/public/common/content_features.cc | 4 +-- .../variations_render_thread_observer.cc | 9 ------ .../renderer/core/loader/document_loader.cc | 7 ---- - 17 files changed, 26 insertions(+), 71 deletions(-) + 17 files changed, 26 insertions(+), 76 deletions(-) diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn --- a/android_webview/nonembedded/BUILD.gn @@ -262,6 +262,18 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo ClientHintsControllerDelegate* client_hint_delegate = browser_context->GetClientHintsControllerDelegate(); +@@ -128,11 +126,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive( + GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive( + request, browser_context, wc_getter, frame_tree_node_id); + variations::OmniboxURLLoaderThrottle::AppendThrottleIfNeeded(&throttles); +- // TODO(crbug.com/1094303): Consider whether we want to use the WebContents to +- // determine the value for variations::Owner. Alternatively, this is the +- // browser side, and we might be fine with Owner::kUnknown. +- variations::VariationsURLLoaderThrottle::AppendThrottleIfNeeded( +- browser_context->GetVariationsClient(), &throttles); + + return throttles; + } diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/browser/origin_trials/origin_trials_utils.cc --- a/content/browser/origin_trials/origin_trials_utils.cc +++ b/content/browser/origin_trials/origin_trials_utils.cc diff --git a/build/patches/Improve-plain-text-rendering-on-mobile.patch b/build/patches/Improve-plain-text-rendering-on-mobile.patch index 688407f4..566a4855 100644 --- a/build/patches/Improve-plain-text-rendering-on-mobile.patch +++ b/build/patches/Improve-plain-text-rendering-on-mobile.patch @@ -15,9 +15,9 @@ diff --git a/third_party/blink/renderer/core/html/parser/text_document_parser.cc attributes.clear(); + // Scale up text to look good on Mobile -+ attributes.push_back(Attribute(html_names::kNameAttr, "viewport")); ++ attributes.push_back(Attribute(html_names::kNameAttr, AtomicString("viewport"))); + attributes.push_back(Attribute(html_names::kContentAttr, -+ "width=device-width, initial-scale=1.0, maximum-scale=1.0")); ++ AtomicString("width=device-width, initial-scale=1.0, maximum-scale=1.0"))); + AtomicHTMLToken viewport_meta(HTMLToken::kStartTag, + html_names::HTMLTag::kMeta, attributes); + TreeBuilder()->ConstructTree(&viewport_meta); diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 4b68477b..f6839475 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chromium/chrome/browser/tab/TabUtils.java | 24 ++- .../browser/android/content/content_utils.cc | 28 +++ .../preferences/browser_prefs_android.cc | 7 + - .../privacy_preferences_manager_impl.cc | 125 ++++++++++++ + .../privacy_preferences_manager_impl.cc | 124 ++++++++++++ .../preferences/ChromePreferenceKeys.java | 5 + .../settings/PrivacyPreferencesManager.java | 8 + .../org/chromium/chrome/browser/tab/Tab.java | 2 + @@ -41,7 +41,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/web_contents/web_contents_impl.cc | 4 + .../framehost/NavigationControllerImpl.java | 3 +- content/renderer/render_thread_impl.cc | 1 - - 31 files changed, 763 insertions(+), 16 deletions(-) + 31 files changed, 762 insertions(+), 16 deletions(-) create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java @@ -593,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mContentView.addOnAttachStateChangeListener(mAttachStateChangeListener); updateInteractableState(); -@@ -1620,6 +1657,10 @@ public class TabImpl implements Tab { +@@ -1621,6 +1658,10 @@ public class TabImpl implements Tab { 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"); } -@@ -1756,6 +1797,13 @@ public class TabImpl implements Tab { +@@ -1757,6 +1798,13 @@ public class TabImpl implements Tab { } 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 -@@ -1821,6 +1869,43 @@ public class TabImpl implements Tab { +@@ -1822,6 +1870,43 @@ public class TabImpl implements Tab { /* forcedByUser */ false, caller); } @@ -807,7 +807,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl static jboolean JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingEnabled( JNIEnv* env) { PrefService* local_state = g_browser_process->local_state(); -@@ -34,3 +60,102 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( +@@ -34,3 +60,101 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( metrics::prefs::kMetricsReportingEnabled) && !local_state->GetBoolean(metrics::prefs::kMetricsReportingEnabled); } @@ -833,9 +833,8 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl + if (iter.GetCurrentValue()->IsInitializedAndNotDead()) { + std::vector cors_exempt_header_list; + iter.GetCurrentValue()->GetRendererInterface()->InitializeRenderer( -+ /*user_agent*/ ua, /*full_user_agent*/ ua, /*reduced_user_agent*/ ua, -+ /*metadata*/ blink::UserAgentMetadata(), cors_exempt_header_list, -+ content::AttributionManager::GetSupport(), ++ /*user_agent*/ ua, /*metadata*/ blink::UserAgentMetadata(), ++ cors_exempt_header_list, content::AttributionManager::GetSupport(), + g_browser_process->GetOriginTrialsSettingsStorage()->GetSettings()); + } + } diff --git a/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch b/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch index ec9fde1d..c984651a 100644 --- a/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch +++ b/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch @@ -12,8 +12,8 @@ Based on Chromium 114.0.5735.53 chrome/app/chrome_main_delegate.cc | 7 +- chrome/browser/BUILD.gn | 38 + chrome/browser/adblock/README.md | 3 + - .../adblock/adblock_content_browser_client.cc | 372 +++ - .../adblock/adblock_content_browser_client.h | 110 + + .../adblock/adblock_content_browser_client.cc | 374 +++ + .../adblock/adblock_content_browser_client.h | 111 + ...adblock_content_browser_client_unittest.cc | 198 ++ .../adblock/adblock_controller_factory.cc | 110 + .../adblock/adblock_controller_factory.h | 52 + @@ -440,7 +440,7 @@ Based on Chromium 114.0.5735.53 .../url_loader/mojo_url_loader_client.cc | 6 +- .../definitions/adblock_private.d.ts | 191 ++ .../definitions/eyeo_filtering_private.d.ts | 228 ++ - 436 files changed, 46716 insertions(+), 11 deletions(-) + 436 files changed, 46719 insertions(+), 11 deletions(-) create mode 100644 chrome/browser/adblock/README.md create mode 100644 chrome/browser/adblock/adblock_content_browser_client.cc create mode 100644 chrome/browser/adblock/adblock_content_browser_client.h @@ -989,7 +989,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/autofill/android:autofill_java", "//components/background_task_scheduler:background_task_scheduler_java", "//components/background_task_scheduler:background_task_scheduler_task_ids_java", -@@ -1602,6 +1608,7 @@ if (current_toolchain == default_toolchain) { +@@ -1601,6 +1607,7 @@ if (current_toolchain == default_toolchain) { "//chrome/test/android:chrome_java_integration_test_support", "//chrome/test/android:chrome_java_test_pagecontroller", "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java", @@ -997,7 +997,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/autofill/android:autofill_features_java", "//components/autofill/android:autofill_java", "//components/background_task_scheduler:background_task_scheduler_java", -@@ -1793,6 +1800,7 @@ if (current_toolchain == default_toolchain) { +@@ -1792,6 +1799,7 @@ if (current_toolchain == default_toolchain) { srcjar_deps = [ "//chrome/browser:tos_dialog_behavior_generated_enum" ] data = [ @@ -1005,7 +1005,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/test/data/android/", "//chrome/test/data/autofill/", "//chrome/test/data/background_sync/", -@@ -3503,6 +3511,7 @@ group("jni_headers") { +@@ -3502,6 +3510,7 @@ group("jni_headers") { "//chrome/browser/ui/messages/android:jni_headers", "//chrome/browser/util:jni_headers", "//chrome/browser/webauthn/android:jni_headers", @@ -1132,7 +1132,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b new file mode 100644 --- /dev/null +++ b/chrome/browser/adblock/adblock_content_browser_client.cc -@@ -0,0 +1,372 @@ +@@ -0,0 +1,374 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -1456,14 +1456,16 @@ new file mode 100644 + header_client, + bool* bypass_redirect_checks, + bool* disable_secure_dns, -+ network::mojom::URLLoaderFactoryOverridePtr* factory_override) { ++ network::mojom::URLLoaderFactoryOverridePtr* factory_override, ++ scoped_refptr navigation_response_task_runner) { + // Create Chromium proxy first as WebRequestProxyingURLLoaderFactory logic + // depends on being first proxy + bool use_chrome_proxy = + ChromeContentBrowserClient::WillCreateURLLoaderFactory( + browser_context, frame, render_process_id, type, request_initiator, + navigation_id, ukm_source_id, factory_receiver, header_client, -+ bypass_redirect_checks, disable_secure_dns, factory_override); ++ bypass_redirect_checks, disable_secure_dns, factory_override, ++ navigation_response_task_runner); + auto* profile = frame ? Profile::FromBrowserContext( + frame->GetProcess()->GetBrowserContext()) + : nullptr; @@ -1509,7 +1511,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.h b/chrome/br new file mode 100644 --- /dev/null +++ b/chrome/browser/adblock/adblock_content_browser_client.h -@@ -0,0 +1,110 @@ +@@ -0,0 +1,111 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -1591,7 +1593,8 @@ new file mode 100644 + header_client, + bool* bypass_redirect_checks, + bool* disable_secure_dns, -+ network::mojom::URLLoaderFactoryOverridePtr* factory_override) override; ++ network::mojom::URLLoaderFactoryOverridePtr* factory_override, ++ scoped_refptr navigation_response_task_runner) override; + + private: + void CreateWebSocketInternal( diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index 96c5a5f9..66242549 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/metrics/uma_session_stats.cc | 10 - .../android/signin/signin_manager_android.cc | 27 +- chrome/browser/browser_process_impl.cc | 1 - - .../browser/chrome_content_browser_client.cc | 35 -- + .../browser/chrome_content_browser_client.cc | 35 +- .../domain_reliability/service_factory.cc | 33 +- chrome/browser/extensions/BUILD.gn | 1 - .../log_sources/chrome_internal_log_source.cc | 5 - @@ -58,7 +58,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html content/public/common/content_features.cc | 12 +- net/base/url_util.cc | 21 -- services/network/network_context.cc | 2 +- - 51 files changed, 61 insertions(+), 804 deletions(-) + 51 files changed, 64 insertions(+), 801 deletions(-) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn @@ -191,15 +191,29 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch if (auto* throttle_manager = subresource_filter::ContentSubresourceFilterThrottleManager:: FromNavigationHandle(*handle)) { -@@ -5594,20 +5587,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( - GetPrerenderCanceler(wc_getter))); - } +@@ -5514,7 +5507,8 @@ GetClientDataHeader(int frame_tree_node_id) { + } + #endif + +-std::unique_ptr CreateGoogleURLLoaderThrottle( ++ ++#if 0 // std::unique_ptr CreateGoogleURLLoaderThrottle( + #if BUILDFLAG(IS_ANDROID) + const std::string& client_data_header, + #endif +@@ -5553,7 +5547,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( + std::move(bound_session_request_throttled_listener), + #endif + std::move(dynamic_params)); +-} ++#endif // } + + std::vector> + ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -5599,15 +5593,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( + GetClientDataHeader(frame_tree_node_id); + #endif --#if BUILDFLAG(IS_ANDROID) -- auto [client_data_header, is_custom_tab] = -- GetClientDataHeader(frame_tree_node_id); --#endif -- - if (auto google_throttle = CreateGoogleURLLoaderThrottle( -#if BUILDFLAG(IS_ANDROID) - client_data_header, @@ -212,7 +226,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch { auto* factory = ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context); -@@ -5661,20 +5640,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( +@@ -5661,20 +5646,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( } #endif