morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-15 00:44:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update patches

Browse Source
This commit is contained in:
xsmile
2018-04-18 18:27:13 +02:00
parent be89522c01
commit c17c571215
20 changed files with 1122 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/config_bundles/common/patch_order.list
View File

@@ -1,3 +1,4 @@
inox-patchset/add-missing-blink-tools.patch
inox-patchset/fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch
inox-patchset/fix-frame-buttons-rendering-too-large-when-using-OSX.patch
inox-patchset/chromium-exclude_unwind_tables.patch

2
resources/config_bundles/linux_rooted/patch_order.list
View File

@@ -1,4 +1,4 @@
inox-patchset/chromium-vaapi-r17.patch
inox-patchset/chromium-vaapi-r18.patch
debian/master-preferences.patch
debian/system/vpx.patch

2
resources/config_bundles/opensuse/patch_order.list
View File

@@ -1,4 +1,4 @@
inox-patchset/chromium-vaapi-r17.patch
inox-patchset/chromium-vaapi-r18.patch
ungoogled-chromium/linux/fix-libstdcxx-errors.patch

4
resources/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch
View File

@@ -1432,7 +1432,7 @@
#include "components/safe_browsing/renderer/websocket_sb_handshake_throttle.h"
#include "components/spellcheck/spellcheck_build_features.h"
#include "components/startup_metric_utils/common/startup_metric.mojom.h"
@@ -1388,9 +1387,7 @@ void ChromeContentRendererClient::InitSp
@@ -1387,9 +1386,7 @@ void ChromeContentRendererClient::InitSp
std::unique_ptr<blink::WebSocketHandshakeThrottle>
ChromeContentRendererClient::CreateWebSocketHandshakeThrottle() {
@@ -1443,7 +1443,7 @@
}
std::unique_ptr<blink::WebSpeechSynthesizer>
@@ -1681,13 +1678,6 @@ ChromeContentRendererClient::GetTaskSche
@@ -1680,13 +1677,6 @@ ChromeContentRendererClient::GetTaskSche
return task_scheduler_util::GetTaskSchedulerInitParamsForRenderer();
}

2
resources/patches/inox-patchset/0006-modify-default-prefs.patch
View File

@@ -167,7 +167,7 @@
prefs::kCloudPrintXmppPingEnabled, false);
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
@@ -144,10 +144,6 @@ void LocalDiscoveryUI::RegisterProfilePr
@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePr
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kLocalDiscoveryNotificationsEnabled,

2
resources/patches/inox-patchset/0018-disable-first-run-behaviour.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -58,7 +58,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
@@ -60,7 +60,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
// Onboarding content has not been launched on Chrome OS.

1070
resources/patches/inox-patchset/add-missing-blink-tools.patch Normal file
View File

File diff suppressed because it is too large Load Diff

81
resources/patches/inox-patchset/allow-stat-in-Linux-for-GPU-process-for-a-list-of-files.patch
View File

@@ -1,81 +0,0 @@
From 6b1b6d3a8555075e23cca89335e855d55f35fba9 Mon Sep 17 00:00:00 2001
From: Zhenyao Mo <zmo@chromium.org>
Date: Thu, 29 Mar 2018 23:48:19 +0000
Subject: [PATCH] Allow `stat` in Linux for GPU process for a list of files.
This is to unblock certain NVidia driver's glReadPixels calls in the sandboxed
GPU process.
Note that the needed file /dev/nvidiactl is already in the list for read/write.
BUG=817400
TEST=manual
R=tsepez@chromium.org
Change-Id: I9074a8335a9c4df1487f5a288d5e284bbedf67c3
Reviewed-on: https://chromium-review.googlesource.com/965462
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547027}
---
content/gpu/gpu_sandbox_hook_linux.cc | 5 ++++-
.../service_manager/sandbox/linux/bpf_gpu_policy_linux.cc | 15 ++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
--- a/content/gpu/gpu_sandbox_hook_linux.cc
+++ b/content/gpu/gpu_sandbox_hook_linux.cc
@@ -153,6 +153,7 @@ void AddStandardGpuWhiteList(std::vector
static const char kDriCardBasePath[] = "/dev/dri/card";
static const char kNvidiaCtlPath[] = "/dev/nvidiactl";
static const char kNvidiaDeviceBasePath[] = "/dev/nvidia";
+ static const char kNvidiaDeviceModeSetPath[] = "/dev/nvidia-modeset";
static const char kNvidiaParamsPath[] = "/proc/driver/nvidia/params";
static const char kDevShm[] = "/dev/shm/";
@@ -172,6 +173,8 @@ void AddStandardGpuWhiteList(std::vector
permissions->push_back(BrokerFilePermission::ReadWrite(
base::StringPrintf("%s%d", kNvidiaDeviceBasePath, i)));
}
+ permissions->push_back(
+ BrokerFilePermission::ReadWrite(kNvidiaDeviceModeSetPath));
permissions->push_back(BrokerFilePermission::ReadOnly(kNvidiaParamsPath));
}
@@ -262,9 +265,9 @@ sandbox::syscall_broker::BrokerCommandSe
sandbox::syscall_broker::BrokerCommandSet command_set;
command_set.set(sandbox::syscall_broker::COMMAND_ACCESS);
command_set.set(sandbox::syscall_broker::COMMAND_OPEN);
+ command_set.set(sandbox::syscall_broker::COMMAND_STAT);
if (IsChromeOS() && options.use_amd_specific_policies) {
command_set.set(sandbox::syscall_broker::COMMAND_READLINK);
- command_set.set(sandbox::syscall_broker::COMMAND_STAT);
}
return command_set;
}
--- a/services/service_manager/sandbox/linux/bpf_gpu_policy_linux.cc
+++ b/services/service_manager/sandbox/linux/bpf_gpu_policy_linux.cc
@@ -61,7 +61,20 @@ ResultExpr GpuProcessPolicy::EvaluateSys
case __NR_open:
#endif // !defined(__aarch64__)
case __NR_faccessat:
- case __NR_openat: {
+ case __NR_openat:
+#if defined(__NR_stat)
+ case __NR_stat:
+#endif
+#if defined(__NR_stat64)
+ case __NR_stat64:
+#endif
+#if defined(__NR_fstatat)
+ case __NR_fstatat:
+#endif
+#if defined(__NR_newfstatat)
+ case __NR_newfstatat:
+#endif
+ {
auto* broker_process = SandboxLinux::GetInstance()->broker_process();
DCHECK(broker_process);
return Trap(BrokerProcess::SIGSYS_Handler, broker_process);

21
resources/patches/inox-patchset/chromium-clang-r2.patch
View File

@@ -1,21 +0,0 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -433,18 +433,6 @@ config("compiler") {
cflags += [ "-fcolor-diagnostics" ]
}
- # TODO(hans): Remove this once Clang generates better optimized debug info by
- # default. https://crbug.com/765793
- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
- target_os != "chromeos") {
- cflags += [
- "-Xclang",
- "-mllvm",
- "-Xclang",
- "-instcombine-lower-dbg-declare=0",
- ]
- }
-
# Print absolute paths in diagnostics. There is no precedent for doing this
# on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
# Windows developers rely on it (crbug.com/636109) so only do this on Windows.

21
resources/patches/inox-patchset/chromium-ffmpeg-clang.patch
View File

@@ -1,21 +0,0 @@
--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
@@ -640,18 +640,8 @@ def ConfigureAndBuild(target_arch, targe
if 'win' not in target_os:
configure_flags['Common'].extend([
'--enable-pic',
- '--cc=clang',
- '--cxx=clang++',
- '--ld=clang',
])
- # Clang Linux will use the first 'ld' it finds on the path, which will
- # typically be the system one, so explicitly configure use of Clang's
- # ld.lld, to ensure that things like cross-compilation and LTO work.
- # This does not work for arm64, ia32 and is always used on mac.
- if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac':
- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
-
# Should be run on Mac.
if target_os == 'mac':
if host_os != 'mac':

20
resources/patches/inox-patchset/chromium-vaapi-r17.patch → resources/patches/inox-patchset/chromium-vaapi-r18.patch
View File

@@ -1,4 +1,4 @@
From d9ef948bf4a739f95acbd98ef88b04caa29d8dda Mon Sep 17 00:00:00 2001
From e95d904578c265a84f117d7d5eff598423f9283d Mon Sep 17 00:00:00 2001
From: Daniel Charles <daniel.charles@intel.com>
Date: Fri, 09 Feb 2018 14:39:27 -0800
Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
@@ -29,14 +29,14 @@ TEST=subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder
have libva/intel-vaapi-driver installed and not installed in the system
repeat on different hardware families
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
---
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1281,12 +1281,14 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1234,12 +1234,14 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kUiPartialSwapDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{"enable-webrtc-hw-h264-encoding",
flag_descriptions::kWebrtcHwH264EncodingName,
flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
@@ -1582,6 +1584,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1553,6 +1555,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kShowTouchHudDescription, kOsCrOS,
SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
#endif // OS_CHROMEOS
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -1589,6 +1598,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1560,6 +1569,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
@@ -73,7 +73,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#if defined(OS_WIN)
{"enable-hdr", flag_descriptions::kEnableHDRName,
flag_descriptions::kEnableHDRDescription, kOsWin,
@@ -2300,12 +2310,17 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2283,12 +2293,17 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR
#endif // ENABLE_VR
@@ -143,7 +143,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
const char kAcceleratedVideoDecodeDescription[] =
"Hardware-accelerated video decode where available.";
@@ -1723,6 +1730,7 @@ const char kWebrtcEchoCanceller3Name[] =
@@ -1730,6 +1737,7 @@ const char kWebrtcEchoCanceller3Name[] =
const char kWebrtcEchoCanceller3Description[] =
"Experimental WebRTC echo canceller (AEC3).";
@@ -151,7 +151,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
const char kWebrtcHwDecodingDescription[] =
"Support in WebRTC for decoding video streams using platform hardware.";
@@ -1730,6 +1738,7 @@ const char kWebrtcHwDecodingDescription[
@@ -1737,6 +1745,7 @@ const char kWebrtcHwDecodingDescription[
const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
const char kWebrtcHwEncodingDescription[] =
"Support in WebRTC for encoding video streams using platform hardware.";
@@ -159,7 +159,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
const char kWebrtcHwH264EncodingDescription[] =
@@ -2549,14 +2558,16 @@ const char kTabStripKeyboardFocusDescrip
@@ -2561,14 +2570,16 @@ const char kTabStripKeyboardFocusDescrip
// Chrome OS -------------------------------------------------------------------
@@ -190,7 +190,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
extern const char kAcceleratedVideoDecodeName[];
extern const char kAcceleratedVideoDecodeDescription[];
@@ -1561,13 +1565,17 @@ extern const char kPermissionPromptPersi
@@ -1569,13 +1573,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)

2
resources/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
View File

@@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1864,8 +1864,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1880,8 +1880,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

8
resources/patches/ungoogled-chromium/add-flag-for-search-engine-collection.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1242,6 +1242,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1227,6 +1227,10 @@ const FeatureEntry kFeatureEntries[] = {
"Enable stacking in tab strip",
"Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
@@ -15,7 +15,7 @@
"Record histograms and user actions.",
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF
@@ -141,9 +141,10 @@ ChromeRenderFrameObserver::ChromeRenderF
if (!render_frame->IsMainFrame())
return;
@@ -27,7 +27,7 @@
if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
SetClientSidePhishingDetection(true);
#endif
@@ -327,14 +328,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -328,14 +329,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent())
return;
@@ -54,7 +54,7 @@
--- a/chrome/renderer/chrome_render_frame_observer.h
+++ b/chrome/renderer/chrome_render_frame_observer.h
@@ -96,6 +96,7 @@ class ChromeRenderFrameObserver : public
@@ -98,6 +98,7 @@ class ChromeRenderFrameObserver : public
// Have the same lifetime as us.
translate::TranslateHelper* translate_helper_;
safe_browsing::PhishingClassifierDelegate* phishing_classifier_;

10
resources/patches/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -175,6 +175,16 @@ const unsigned kOsDesktop = kOsMac | kOs
@@ -181,6 +181,16 @@ const unsigned kOsDesktop = kOsMac | kOs
const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
#endif // USE_AURA
@@ -20,7 +20,7 @@
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceAutomatic, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -1224,6 +1234,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1209,6 +1219,10 @@ const FeatureEntry kFeatureEntries[] = {
{"disable-trkbar", flag_descriptions::kDisableTrkbarName,
flag_descriptions::kDisableTrkbarDescription, kOsAll,
SINGLE_VALUE_TYPE("disable-trkbar")},
@@ -41,7 +41,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
@@ -116,6 +117,14 @@ scoped_refptr<extensions::CrxInstaller>
@@ -119,6 +120,14 @@ scoped_refptr<extensions::CrxInstaller>
return installer;
}
@@ -56,7 +56,7 @@
bool IsExtensionDownload(const DownloadItem& download_item) {
if (download_item.GetTargetDisposition() ==
DownloadItem::TARGET_DISPOSITION_PROMPT)
@@ -124,7 +133,7 @@ bool IsExtensionDownload(const DownloadI
@@ -127,7 +136,7 @@ bool IsExtensionDownload(const DownloadI
if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
extensions::UserScript::IsURLUserScript(download_item.GetURL(),
download_item.GetMimeType())) {
@@ -104,7 +104,7 @@
bool IsExtensionDownload(const download::DownloadItem& download_item);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -900,10 +900,12 @@ DownloadConfirmationReason DownloadTarge
@@ -901,10 +901,12 @@ DownloadConfirmationReason DownloadTarge
return DownloadConfirmationReason::SAVE_AS;
#if BUILDFLAG(ENABLE_EXTENSIONS)

2
resources/patches/ungoogled-chromium/add-flag-to-enable-potentially-annoying-security-features.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2073,11 +2073,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2079,11 +2079,11 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-wifi-credential-sync", flag_descriptions::kWifiCredentialSyncName,
flag_descriptions::kWifiCredentialSyncDescription, kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)},

2
resources/patches/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1250,6 +1250,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1235,6 +1235,10 @@ const FeatureEntry kFeatureEntries[] = {
"Record metrics",
"Record histograms and user actions.",
kOsAll, SINGLE_VALUE_TYPE("enable-metrics")},

12
resources/patches/ungoogled-chromium/add-flag-to-stack-tabs.patch
View File

@@ -2,15 +2,7 @@
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/auto_reset.h"
+#include "base/command_line.h"
#include "base/macros.h"
#include "base/metrics/user_metrics.h"
#include "base/task_scheduler/post_task.h"
@@ -66,13 +67,13 @@ using content::WebContents;
@@ -68,16 +68,15 @@ using content::WebContents;
namespace {
bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
@@ -32,7 +24,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1224,6 +1224,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1209,6 +1209,10 @@ const FeatureEntry kFeatureEntries[] = {
{"disable-trkbar", flag_descriptions::kDisableTrkbarName,
flag_descriptions::kDisableTrkbarDescription, kOsAll,
SINGLE_VALUE_TYPE("disable-trkbar")},

34
resources/patches/ungoogled-chromium/block-trk-and-subdomains.patch
View File

@@ -36,17 +36,17 @@
GURL rewritten_tab_url = tab_url;
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -148,6 +148,7 @@ class InfoBarDelegate {
FRAMEBUST_BLOCK_INFOBAR_ANDROID = 77,
@@ -149,6 +149,7 @@ class InfoBarDelegate {
SURVEY_INFOBAR_ANDROID = 78,
NEAR_OOM_INFOBAR_ANDROID = 79,
INSTALLABLE_AMBIENT_BADGE_INFOBAR_DELEGATE = 80,
+ TRACKING_ALERT_INFOBAR_DELEGATE = 9001,
};
// Describes navigation events, used to decide whether infobars should be
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -486,7 +486,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -487,7 +487,8 @@ void AutocompleteInput::ParseForEmphasiz
int after_scheme_and_colon = parts.scheme.end() + 1;
// For the view-source scheme, we should emphasize the scheme and host of the
// URL qualified by the view-source prefix.
@@ -56,7 +56,7 @@
(static_cast<int>(text.length()) > after_scheme_and_colon)) {
// Obtain the URL prefixed by view-source and parse it.
base::string16 real_url(text.substr(after_scheme_and_colon));
@@ -555,7 +556,9 @@ int AutocompleteInput::NumNonHostCompone
@@ -556,7 +557,9 @@ int AutocompleteInput::NumNonHostCompone
bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
std::string utf8_input(base::UTF16ToUTF8(input));
url::Component scheme;
@@ -106,10 +106,10 @@
}
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -350,6 +350,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -348,6 +348,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterPseudoScheme(url::kAboutScheme);
RegisterPseudoScheme(url::kJavaScriptScheme);
RegisterPseudoScheme(kViewSourceScheme);
RegisterPseudoScheme(url::kHttpSuboriginScheme);
RegisterPseudoScheme(url::kHttpsSuboriginScheme);
+ RegisterPseudoScheme(url::kTraceScheme);
}
@@ -317,7 +317,7 @@
+#endif /* UNGOOGLED_TRKNOTIFY_H */
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -43,6 +43,9 @@
@@ -42,6 +42,9 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -326,7 +326,7 @@
+#include "third_party/ungoogled/util.h"
#if BUILDFLAG(ENABLE_REPORTING)
#include "net/url_request/network_error_logging_delegate.h"
#include "net/network_error_logging/network_error_logging_service.h"
@@ -581,6 +584,11 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -341,10 +341,10 @@
NetLogEventType::REQUEST_ALIVE,
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -22515,6 +22515,7 @@ Called by update_gpu_driver_bug_workarou
<int value="77" label="FRAMEBUST_BLOCK_INFOBAR_ANDROID"/>
@@ -22864,6 +22864,7 @@ Called by update_gpu_driver_bug_workarou
<int value="78" label="SURVEY_INFOBAR_ANDROID"/>
<int value="79" label="NEAR_OOM_INFOBAR_ANDROID"/>
<int value="80" label="INSTALLABLE_AMBIENT_BADGE_INFOBAR_DELEGATE"/>
+ <int value="9001" label="TRACKING_ALERT_INFOBAR_DELEGATE"/>
</enum>
@@ -371,7 +371,7 @@
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -539,6 +539,10 @@ GURL FixupURL(const std::string& text, c
@@ -536,6 +536,10 @@ GURL FixupURL(const std::string& text, c
}
}
@@ -384,7 +384,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1221,6 +1221,9 @@ const FeatureEntry::FeatureVariation kWe
@@ -1206,6 +1206,9 @@ const FeatureEntry::FeatureVariation kSi
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -396,7 +396,7 @@
"Record histograms and user actions.",
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -781,6 +781,12 @@ const char kIconNtpName[] = "Large icons
@@ -849,6 +849,12 @@ const char kIconNtpName[] = "Large icons
const char kIconNtpDescription[] =
"Enable the experimental New Tab page using large icons.";
@@ -411,7 +411,7 @@
"Overrides the built-in software rendering list and enables "
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -490,6 +490,9 @@ extern const char kHtmlBasedUsernameDete
@@ -532,6 +532,9 @@ extern const char kHtmlBasedUsernameDete
extern const char kIconNtpName[];
extern const char kIconNtpDescription[];
@@ -483,7 +483,7 @@
+#endif /* UNGOOGLED_UTIL_H */
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -366,6 +366,7 @@ component("net") {
@@ -367,6 +367,7 @@ component("net") {
"//net/data/ssl/certificate_transparency:ct_log_list",
"//third_party/protobuf:protobuf_lite",
"//url:url_features",
@@ -493,7 +493,7 @@
if (include_transport_security_state_preload_list) {
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -166,6 +166,7 @@ jumbo_source_set("browser") {
@@ -172,6 +172,7 @@ jumbo_source_set("browser") {
"//third_party/icu",
"//third_party/libyuv",
"//third_party/re2",

4
resources/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch
View File

@@ -108,7 +108,7 @@
#else
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -114706,6 +114706,7 @@ http://cs/file:chrome/histograms.xml - b
@@ -114814,6 +114814,7 @@ http://cs/file:chrome/histograms.xml - b
<suffix name="OpenInChrome"/>
<suffix name="SiteSettings"/>
<suffix name="AppInfo"/>
@@ -142,7 +142,7 @@
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -46984,6 +46984,7 @@ Called by update_traffic_annotation_hist
@@ -47000,6 +47000,7 @@ Called by update_traffic_annotation_hist
<int value="48" label="Open in Chrome"/>
<int value="49" label="Site Settings"/>
<int value="50" label="App Info"/>

4
resources/patches/ungoogled-chromium/disable-mei-preload.patch
View File

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -303,7 +303,6 @@ if (!is_android && !is_mac) {
@@ -306,7 +306,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm:widevinecdmadapter",
]
@@ -1237,7 +1236,6 @@ if (is_win) {
@@ -1283,7 +1282,6 @@ if (is_win) {
":widevine_cdm_library",
"//build/config:exe_and_shlib_deps",
"//chrome/app/nibs:chrome_xibs",