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

Merge branch 'master' into fragmentation

Browse Source
This commit is contained in:
Eloston
2019-03-10 20:37:45 +00:00
parent a972b40607 c05261efcf
commit 63bea952c4
103 changed files with 3115 additions and 2026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -107,6 +107,7 @@ To build ungoogled-chromium, see [Source Code](#source-code).
* Arch Linux: [Available in AUR as `ungoogled-chromium`](https://aur.archlinux.org/packages/ungoogled-chromium/)
* NOTE: `ungoogled-chromium-bin` is *not* officially part of ungoogled-chromium. Please submit all issues to the maintainer of the PKGBUILD.
* Gentoo Linux: [`::chaoslab`](https://gitlab.com/chaoslab/chaoslab-overlay) overlay maintains an *unofficial* [`ungoogled-chromium`](https://gitlab.com/chaoslab/chaoslab-overlay/tree/master/www-client/ungoogled-chromium) ebuild.
* GNU Guix: Available as `ungoogled-chromium`.
* macOS cask: Available as `eloston-chromium`
### Contributor Binaries

2
chromium_version.txt
View File

@@ -1 +1 @@
71.0.3578.98
72.0.3626.122

17
docs/building.md
View File

@@ -164,12 +164,25 @@ A zip archive will be created in `build\src`
* Xcode 8-9
* Homebrew
* Perl (for creating a `.dmg` package)
* Python 2, specifically 2.7.13 or newer
* Python 2, specifically 2.7.13 or newer, as `python` in PATH
* Python 3.5 or newer as `python3` in PATH
### Setting up the build environment
1. Install Ninja via Homebrew: `brew install ninja`
2. Install GNU coreutils (for `greadlink` in packaging script): `brew install coreutils`
3. Install GNU readline: `brew install readline`
4. Install the data compression tools xz and zlib: `brew install xz zlib`
5. Install Python 3.x: `brew install python`
6. Install Python's pyenv to manage python version: `brew install pyenv`
7. Install Python 2.7.13: `pyenv install 2.7.13`
**Note**: in some cases you might get `Build failed: "ERROR: The Python zlib extension was not compiled. Missing the zlib?"` during Python 2.7.13 installation, this can be fixed by running `CPPFLAGS="-I$(brew --prefix zlib)/include" pyenv install 2.7.13`.
8. Setup `pyenv`:
```sh
echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init -)"\nfi' >> ~/.bash_profile
```
8. Set global `python` command to use Python 2.7.13: `pyenv global 2.7.13`.
9. Restart your Terminal
### Building
@@ -178,7 +191,7 @@ First, ensure the Xcode application is open. Then, run the following:
```sh
# Run from inside the clone of the repository
mkdir -p build/src/ungoogled_packaging
./get_package.py macos build/src/ungoogled_packaging
python3 get_package.py macos build/src/ungoogled_packaging
cd build/src
./ungoogled_packaging/build.sh
```

623
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

1
flags.gn
View File

@@ -1,5 +1,6 @@
blink_symbol_level=0
clang_use_chrome_plugins=false
closure_compile=false
enable_ac3_eac3_audio_demuxing=true
enable_hangout_services_extension=false
enable_hevc_demuxing=true

2
patches/core/bromite/disable-fetching-field-trials.patch
View File

@@ -45,7 +45,7 @@ Subject: Disable fetching of all field trials
// Alphabetical:
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -232,17 +232,7 @@ bool GetInstanceManipulations(const net:
@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net:
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {

20
patches/core/debian_buster/disable/perfetto.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -648,7 +648,7 @@ group("gn_all") {
@@ -666,7 +666,7 @@ group("gn_all") {
}
}
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/services/tracing/BUILD.gn
+++ b/services/tracing/BUILD.gn
@@ -30,7 +30,7 @@ source_set("lib") {
@@ -27,7 +27,7 @@ source_set("lib") {
"//services/tracing/public/cpp",
]
@@ -23,16 +23,16 @@ author: Michael Gilbert <mgilbert@debian.org>
sources += [
"perfetto/json_trace_exporter.cc",
"perfetto/json_trace_exporter.h",
@@ -80,7 +80,7 @@ source_set("tests") {
@@ -64,7 +64,7 @@ source_set("tests") {
"test_util.h",
]
- if (is_mac || is_linux || is_android) {
+ if (false) {
sources += [ "public/cpp/perfetto/trace_event_data_source_unittest.cc" ]
}
@@ -101,7 +101,7 @@ source_set("tests") {
sources += [
"public/cpp/perfetto/trace_event_data_source_unittest.cc",
"public/cpp/perfetto/traced_value_proto_writer_unittest.cc",
@@ -88,7 +88,7 @@ source_set("tests") {
"//testing/gtest",
]
@@ -43,7 +43,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"perfetto/perfetto_integration_unittest.cc",
--- a/services/tracing/tracing_service.h
+++ b/services/tracing/tracing_service.h
@@ -17,8 +17,7 @@
@@ -19,8 +19,7 @@
#include "services/tracing/agent_registry.h"
#include "services/tracing/coordinator.h"
@@ -62,8 +62,8 @@ author: Michael Gilbert <mgilbert@debian.org>
- if (is_mac || is_linux || is_android || is_win) {
+ if (false) {
sources += [
"perfetto/producer_client.cc",
"perfetto/producer_client.h",
"perfetto/heap_scattered_stream_delegate.cc",
"perfetto/heap_scattered_stream_delegate.h",
--- a/services/tracing/public/cpp/trace_event_agent.cc
+++ b/services/tracing/public/cpp/trace_event_agent.cc
@@ -22,8 +22,7 @@

22
patches/core/debian_buster/disable/unrar.patch
View File

@@ -16,7 +16,7 @@ bug: http://bugs.debian.org/914487
-
- deps = [
- ":archive_analyzer_results",
- ":download_protection_util",
- ":download_type_util",
- ":file_type_policies",
- "//base",
- "//base:i18n",
@@ -45,10 +45,10 @@ bug: http://bugs.debian.org/914487
source_set("disk_image_type_sniffer_mac") {
sources = [
"disk_image_type_sniffer_mac.cc",
@@ -136,7 +102,6 @@ source_set("safe_browsing") {
@@ -150,7 +116,6 @@ source_set("safe_browsing") {
deps += [
":archive_analyzer_results",
":download_protection_util",
":download_type_util",
- ":rar_analyzer",
"//components/safe_browsing:features",
]
@@ -72,14 +72,14 @@ bug: http://bugs.debian.org/914487
- safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results);
std::move(callback).Run(results);
}
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
@@ -383,7 +383,7 @@ void CheckClientDownloadRequest::Analyze
} else if (item_->GetTargetFilePath().MatchesExtension(
FILE_PATH_LITERAL(".rar")) &&
base::FeatureList::IsEnabled(kInspectDownloadedRarFiles)) {
--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::Fil
if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".zip"))) {
StartExtractZipFeatures();
} else if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".rar"))) {
- StartExtractRarFeatures();
+ LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build";
#if defined(OS_MACOSX)
} else if (item_->GetTargetFilePath().MatchesExtension(
FILE_PATH_LITERAL(".dmg")) ||
} else if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".dmg")) ||
target_path_.MatchesExtension(FILE_PATH_LITERAL(".img")) ||

103
patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
View File

@@ -1,7 +1,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -812,30 +812,6 @@ void SetApplicationLocaleOnIOThread(cons
g_io_thread_application_locale.Get() = locale;
@@ -833,30 +833,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
-// An implementation of the SSLCertReporter interface used by
@@ -31,7 +31,7 @@
#if defined(OS_ANDROID)
float GetDeviceScaleAdjustment() {
static const float kMinFSM = 1.05f;
@@ -1988,7 +1964,7 @@ void ChromeContentBrowserClient::AppendE
@@ -2007,7 +1983,7 @@ void ChromeContentBrowserClient::AppendE
// Disable client-side phishing detection in the renderer if it is
// disabled in the Profile preferences or the browser process.
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -40,7 +40,7 @@
command_line->AppendSwitch(
switches::kDisableClientSidePhishingDetection);
}
@@ -2666,7 +2642,7 @@ void ChromeContentBrowserClient::AllowCe
@@ -2697,7 +2673,7 @@ void ChromeContentBrowserClient::AllowCe
SSLErrorHandler::HandleSSLError(
web_contents, cert_error, ssl_info, request_url,
expired_previous_decision,
@@ -49,7 +49,7 @@
callback, SSLErrorHandler::BlockingPageReadyCallback());
}
@@ -2936,8 +2912,6 @@ bool ChromeContentBrowserClient::CanCrea
@@ -2977,8 +2953,6 @@ bool ChromeContentBrowserClient::CanCrea
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -58,7 +58,7 @@
for (size_t i = 0; i < extra_parts_.size(); ++i)
extra_parts_[i]->ResourceDispatcherHostCreated();
@@ -4103,7 +4077,7 @@ ChromeContentBrowserClient::CreateThrott
@@ -4201,7 +4175,7 @@ ChromeContentBrowserClient::CreateThrott
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
@@ -69,7 +69,7 @@
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -536,18 +536,6 @@ ProfileImpl::ProfileImpl(
@@ -549,18 +549,6 @@ ProfileImpl::ProfileImpl(
create_mode == CREATE_MODE_SYNCHRONOUS);
#endif
@@ -88,7 +88,7 @@
content::BrowserContext::Initialize(this, path_);
{
@@ -556,7 +544,7 @@ ProfileImpl::ProfileImpl(
@@ -569,7 +557,7 @@ ProfileImpl::ProfileImpl(
->CreateDelegate();
delegate->InitPrefRegistry(pref_registry_.get());
prefs_ = chrome_prefs::CreateProfilePrefs(
@@ -99,7 +99,7 @@
GetIOTaskRunner(), std::move(delegate));
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
@@ -326,8 +326,7 @@ void LogCommittedPreviewsDecision(
@@ -296,8 +296,7 @@ void NotifyUIThreadOfRequestComplete(
} // namespace
ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
@@ -109,7 +109,7 @@
ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() {
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -341,8 +340,6 @@ void ChromeResourceDispatcherHostDelegat
@@ -311,8 +310,6 @@ void ChromeResourceDispatcherHostDelegat
content::AppCacheService* appcache_service,
ResourceType resource_type,
std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
@@ -118,7 +118,7 @@
ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
#if BUILDFLAG(ENABLE_OFFLINE_PAGES) || BUILDFLAG(ENABLE_NACL)
@@ -461,7 +458,7 @@ void ChromeResourceDispatcherHostDelegat
@@ -431,7 +428,7 @@ void ChromeResourceDispatcherHostDelegat
content::ResourceThrottle* first_throttle = NULL;
#if defined(OS_ANDROID)
first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
@@ -129,7 +129,7 @@
#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -251,117 +251,6 @@ BadClockBlockingPage* CreateBadClockBloc
@@ -250,117 +250,6 @@ BadClockBlockingPage* CreateBadClockBloc
base::Callback<void(content::CertificateRequestResultType)>());
}
@@ -247,8 +247,8 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -465,8 +354,6 @@ void InterstitialHTMLSource::StartDataRe
CreateSSLBlockingPage(web_contents, true /* is superfish */));
@@ -460,8 +349,6 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate.reset(CreateSSLBlockingPage(web_contents));
} else if (path_without_query == "/mitm-software-ssl") {
interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
- } else if (path_without_query == "/safebrowsing") {
@@ -256,7 +256,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
@@ -477,11 +364,6 @@ void InterstitialHTMLSource::StartDataRe
@@ -472,11 +359,6 @@ void InterstitialHTMLSource::StartDataRe
if (path_without_query == "/supervised_user") {
html = GetSupervisedUserInterstitialHTML(path);
@@ -360,7 +360,7 @@
}
#if defined(OS_ANDROID)
@@ -618,16 +611,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -616,16 +609,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -379,15 +379,15 @@
void ChromeDownloadManagerDelegate::OpenDownloadUsingPlatformHandler(
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -72,7 +72,6 @@
@@ -73,7 +73,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/tab_lifecycle_unit_source.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/status_icons/status_tray.h"
#include "chrome/browser/ui/browser_dialogs.h"
@@ -373,8 +372,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -371,8 +370,6 @@ void BrowserProcessImpl::StartTearDown()
// that URLFetcher operation before going away.)
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -396,7 +396,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -994,22 +991,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -992,22 +989,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -416,10 +416,10 @@
- return NULL;
-}
-
subresource_filter::ContentRulesetService*
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1300,16 +1281,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1298,16 +1279,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -438,17 +438,17 @@
created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -175,9 +175,6 @@ class BrowserProcessImpl : public Browse
@@ -172,9 +172,6 @@ class BrowserProcessImpl : public Browse
void set_background_mode_manager_for_test(
std::unique_ptr<BackgroundModeManager> manager) override;
StatusTray* status_tray() override;
- safe_browsing::SafeBrowsingService* safe_browsing_service() override;
- safe_browsing::ClientSideDetectionService* safe_browsing_detection_service()
- override;
subresource_filter::ContentRulesetService*
subresource_filter_ruleset_service() override;
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
optimization_guide::OptimizationGuideService* optimization_guide_service()
@@ -324,9 +321,6 @@ class BrowserProcessImpl : public Browse
@@ -326,9 +323,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -456,7 +456,7 @@
- scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service_;
-
bool created_subresource_filter_ruleset_service_ = false;
std::unique_ptr<subresource_filter::ContentRulesetService>
std::unique_ptr<subresource_filter::RulesetService>
subresource_filter_ruleset_service_;
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -469,9 +469,9 @@
-}
-
namespace subresource_filter {
class ContentRulesetService;
class RulesetService;
}
@@ -116,10 +112,6 @@ namespace resource_coordinator {
@@ -117,10 +113,6 @@ class ResourceCoordinatorParts;
class TabManager;
}
@@ -482,7 +482,7 @@
// NOT THREAD SAFE, call only from the main thread.
// These functions shouldn't return NULL unless otherwise noted.
class BrowserProcess {
@@ -234,14 +226,6 @@ class BrowserProcess {
@@ -235,14 +227,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -496,7 +496,7 @@
-
// Returns the service providing versioned storage for rules used by the Safe
// Browsing subresource filter.
virtual subresource_filter::ContentRulesetService*
virtual subresource_filter::RulesetService*
--- a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h
+++ b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h
@@ -12,7 +12,6 @@
@@ -709,7 +709,7 @@
}
}
@@ -382,10 +375,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
@@ -371,10 +364,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
bool DownloadPrefs::EnableAutoOpenBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -778,7 +778,7 @@
void DownloadTargetDeterminer::OnDownloadDestroyed(
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2621,8 +2621,6 @@ jumbo_split_static_library("browser") {
@@ -2649,8 +2649,6 @@ jumbo_split_static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -789,7 +789,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2444,7 +2444,6 @@ jumbo_split_static_library("ui") {
@@ -2420,7 +2420,6 @@ jumbo_split_static_library("ui") {
"views/cookie_info_view.h",
"views/device_chooser_content_view.cc",
"views/device_chooser_content_view.h",
@@ -880,9 +880,9 @@
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -649,35 +649,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -617,35 +617,6 @@ void ChromeBrowsingDataRemoverDelegate::
CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(),
base::BindRepeating(&WebsiteSettingsFilterAdapter, filter));
website_settings_filter);
- // Clear the safebrowsing cookies only if time period is for "all time". It
- // doesn't make sense to apply the time period of deleting in the last X
@@ -918,7 +918,7 @@
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -713,9 +713,6 @@ void ChromeMetricsServiceClient::Registe
@@ -714,9 +714,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());
@@ -930,7 +930,7 @@
std::make_unique<UpgradeMetricsProvider>());
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -230,7 +230,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -233,7 +233,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalServiceFactory::GetInstance();
#endif
@@ -971,10 +971,10 @@
- ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report);
}
bool CertReportHelper::IsShowingReportingCheckboxOrReportingAllowed() {
bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -242,8 +242,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -244,8 +244,6 @@ void TabHelpers::AttachTabHelpers(WebCon
PreviewsUITabHelper::CreateForWebContents(web_contents);
RecentlyAudibleHelper::CreateForWebContents(web_contents);
ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -983,7 +983,7 @@
SearchEngineTabHelper::CreateForWebContents(web_contents);
SecurityStateTabHelper::CreateForWebContents(web_contents);
if (SiteEngagementService::IsEnabled())
@@ -297,9 +295,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -298,9 +296,6 @@ void TabHelpers::AttachTabHelpers(WebCon
new ChromePDFWebContentsHelperClient()));
PluginObserver::CreateForWebContents(web_contents);
SadTabHelper::CreateForWebContents(web_contents);
@@ -1026,7 +1026,7 @@
sources = [
"safe_browsing_controller_client.cc",
"safe_browsing_controller_client.h",
@@ -74,6 +75,7 @@ static_library("safe_browsing") {
@@ -75,6 +76,7 @@ static_library("safe_browsing") {
} else {
sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ]
}
@@ -1036,7 +1036,7 @@
# "Safe Browsing Basic" files used for safe browsing in full mode
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -79,7 +79,6 @@
@@ -80,7 +80,6 @@
#include "components/error_page/common/localized_error.h"
#include "components/network_hints/renderer/prescient_networking_dispatcher.h"
#include "components/pdf/renderer/pepper_pdf_host.h"
@@ -1128,7 +1128,7 @@
is_being_revived_(false) {}
} // namespace
@@ -376,13 +376,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -368,13 +368,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -1145,7 +1145,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -534,9 +534,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -526,9 +526,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -1157,8 +1157,17 @@
return !download_->IsSavePackageDownload() &&
--- a/components/safe_browsing/features.cc
+++ b/components/safe_browsing/features.cc
@@ -46,7 +46,7 @@ const base::Feature kInspectDownloadedRa
"InspectDownloadedRarFiles", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -24,7 +24,7 @@ const base::Feature kAdSamplerTriggerFea
// Controls the billing interstitial UI.
const base::Feature kBillingInterstitial{"BillingInterstitial",
- base::FEATURE_ENABLED_BY_DEFAULT};
+ base::FEATURE_DISABLED_BY_DEFAULT};
// If enabled in pre-network-service world, SafeBrowsing URL checks are done by
// applying SafeBrowsing's URLLoaderThrottle subclasses to ThrottlingURLLoader.
@@ -40,7 +40,7 @@ const base::Feature kForceEnableResetPas
"ForceEnableResetPasswordWebUI", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kSuspiciousSiteTriggerQuotaFeature{
- "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};

33
patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
View File

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -517,45 +517,6 @@ std::tuple<GURL, std::string> AutofillDo
@@ -625,70 +625,6 @@ AutofillDownloadManager::GetRequestURLAn
}
bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -11,7 +11,9 @@
- // Get the URL and method to use for this request.
- std::string method;
- GURL request_url;
- std::tie(request_url, method) = GetRequestURLAndMethod(request_data);
- std::tie(request_url, method) =
- UseApi() ? GetRequestURLAndMethodForApi(request_data)
- : GetRequestURLAndMethod(request_data);
-
- auto resource_request = std::make_unique<network::ResourceRequest>();
- resource_request->url = request_url;
@@ -26,11 +28,34 @@
- : variations::InIncognito::kNo,
- &resource_request->headers);
-
- // Set headers specific to the API if using it.
- if (UseApi())
- // Encode response serialized proto in base64 for safety.
- resource_request->headers.SetHeader(kGoogEncodeResponseIfExecutable,
- "base64");
-
- // Put API key in request's header if there is.
- if (!api_key_.empty() &&
- variations::ShouldAppendVariationHeaders(request_url)) {
- // Make sure that we only send the API key to endpoints trusted by Chrome.
- resource_request->headers.SetHeader(kGoogApiKey, api_key_);
- }
-
- auto simple_loader = network::SimpleURLLoader::Create(
- std::move(resource_request),
- GetNetworkTrafficAnnotation(request_data.request_type));
- if (method == "POST")
- simple_loader->AttachStringForUpload(request_data.payload, "text/proto");
-
- // This allows reading the error message within the API response when status
- // is not 200 (e.g., 400). Otherwise, URL loader will not give any content in
- // the response when there is a failure, which makes debugging hard.
- simple_loader->SetAllowHttpErrorResults(true);
-
- if (method == "POST") {
- const std::string content_type =
- UseApi() ? "application/x-protobuf" : "text/proto";
- // Attach payload data and add data format header.
- simple_loader->AttachStringForUpload(request_data.payload, content_type);
- }
-
- // Transfer ownership of the loader into url_loaders_. Temporarily hang
- // onto the raw pointer to use it as a key and to kick off the request;

12
patches/core/inox-patchset/0005-disable-default-extensions.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -416,11 +416,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -414,11 +414,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
@@ -12,7 +12,7 @@
}
scoped_refptr<const Extension> ComponentLoader::CreateExtension(
@@ -463,11 +458,6 @@ void ComponentLoader::AddDefaultComponen
@@ -461,11 +456,6 @@ void ComponentLoader::AddDefaultComponen
}
#else // defined(OS_CHROMEOS)
DCHECK(!skip_session_components);
@@ -24,7 +24,7 @@
#endif // defined(OS_CHROMEOS)
if (!skip_session_components) {
@@ -543,13 +533,6 @@ void ComponentLoader::AddDefaultComponen
@@ -540,13 +530,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
AddImageLoaderExtension();
@@ -52,7 +52,7 @@
{
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -577,28 +577,6 @@ void WebstoreInstaller::DownloadNextPend
@@ -575,28 +575,6 @@ void WebstoreInstaller::DownloadNextPend
void WebstoreInstaller::DownloadCrx(
const std::string& extension_id,
InstallSource source) {
@@ -81,7 +81,7 @@
}
// http://crbug.com/165634
@@ -743,28 +721,6 @@ void WebstoreInstaller::UpdateDownloadPr
@@ -742,28 +720,6 @@ void WebstoreInstaller::UpdateDownloadPr
}
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
@@ -112,7 +112,7 @@
void WebstoreInstaller::ReportFailure(const std::string& error,
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -26,7 +26,6 @@ namespace extensions {
@@ -25,7 +25,6 @@ namespace extensions {
bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
const char* const kAllowed[] = {

6
patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
View File

@@ -1,6 +1,6 @@
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -115,10 +115,10 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -118,10 +118,10 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -12,5 +12,5 @@
+ { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
// We use a separate histogram name for each platform to facilitate the
// display of error codes by their symbolic name (since each platform has
enum DnsResolveStatus {
RESOLVE_STATUS_DNS_SUCCESS = 0,

12
patches/core/inox-patchset/0015-disable-update-pings.patch
View File

@@ -1,14 +1,18 @@
--- a/components/component_updater/configurator_impl.cc
+++ b/components/component_updater/configurator_impl.cc
@@ -68,14 +68,7 @@ int ConfiguratorImpl::UpdateDelay() cons
@@ -79,18 +79,7 @@ int ConfiguratorImpl::UpdateDelay() cons
}
std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
- if (url_source_override_.is_valid()) {
- if (url_source_override_.is_valid())
- return {GURL(url_source_override_)};
- }
-
- std::vector<GURL> urls{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)};
- std::vector<GURL> urls =
- base::FeatureList::IsEnabled(kFeatureUpdateClientUseJSON)
- ? std::vector<GURL>{GURL(kUpdaterJSONDefaultUrl),
- GURL(kUpdaterJSONFallbackUrl)}
- : std::vector<GURL>{GURL(kUpdaterDefaultUrl),
- GURL(kUpdaterFallbackUrl)};
- if (require_encryption_)
- update_client::RemoveUnsecureUrls(&urls);
-

4
patches/core/inox-patchset/0017-disable-new-avatar-menu.patch
View File

@@ -1,6 +1,6 @@
--- a/components/signin/core/browser/signin_manager.cc
+++ b/components/signin/core/browser/signin_manager.cc
@@ -318,7 +318,7 @@ void SigninManager::OnGoogleServicesUser
@@ -329,7 +329,7 @@ void SigninManager::OnGoogleServicesUser
}
bool SigninManager::IsSigninAllowed() const {
@@ -8,4 +8,4 @@
+ return false;
}
void SigninManager::OnSigninAllowedPrefChanged() {
void SigninManager::SetSigninAllowed(bool allowed) {

2
patches/core/inox-patchset/chromium-exclude_unwind_tables.patch
View File

@@ -1,6 +1,6 @@
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -72,19 +72,19 @@ declare_args() {
@@ -69,19 +69,19 @@ declare_args() {
# It's currently not possible to collect AFDO profiles on anything but
# x86{,_64}.
using_mismatched_sample_profile = current_cpu != "x64" && current_cpu != "x86"

48
patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
View File

@@ -95,9 +95,9 @@ by default.
// creates and uses to publish OEM default apps to the extensions system.
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
@@ -1663,7 +1663,7 @@ void FileManagerPrivateInternalGetDownlo
SigninManagerFactory::GetForProfile(GetProfile());
const std::string& account_id = signin_manager->GetAuthenticatedAccountId();
@@ -1639,7 +1639,7 @@ void FileManagerPrivateInternalGetDownlo
IdentityManagerFactory::GetForProfile(GetProfile());
const std::string& account_id = identity_manager->GetPrimaryAccountId();
std::vector<std::string> scopes;
- scopes.emplace_back("https://www.googleapis.com/auth/drive.readonly");
+ scopes.emplace_back("trk:208:https://www.googleapis.com/auth/drive.readonly");
@@ -152,7 +152,7 @@ by default.
const int kDownloadsLowSpaceWarningHelpNumber = 1061547;
--- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -46,8 +46,8 @@ enum class U2FAttestationPromptResult {
@@ -47,8 +47,8 @@ enum class U2FAttestationPromptResult {
const char kGoogleDotCom[] = "google.com";
constexpr const char* kGoogleGstaticAppIds[] = {
@@ -335,7 +335,7 @@ by default.
SkColor GetThemeColor(const ui::ThemeProvider& tp, int id) {
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -43,9 +43,9 @@ namespace {
@@ -46,9 +46,9 @@ namespace {
// TODO(battre): Delete the HTTP URL once the blacklist is downloaded via HTTPS.
const char kExtensionBlocklistUrlPrefix[] =
@@ -349,16 +349,7 @@ by default.
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -104,7 +104,7 @@ const char kCloudPrintCertificateErrorLe
#endif
const char kCloudPrintNoDestinationsLearnMoreURL[] =
- "https://www.google.com/cloudprint/learn/";
+ "trk:252:https://www.google.com/cloudprint/learn/";
const char kContentSettingsExceptionsLearnMoreURL[] =
"https://support.google.com/chrome/?p=settings_manage_exceptions";
@@ -217,7 +217,7 @@ const char kSyncErrorsHelpURL[] =
@@ -222,7 +222,7 @@ const char kSyncErrorsHelpURL[] =
"https://support.google.com/chrome/?p=settings_sync_error";
const char kSyncGoogleDashboardURL[] =
@@ -367,7 +358,7 @@ by default.
const char kSyncLearnMoreURL[] =
"https://support.google.com/chrome/?p=settings_sign_in";
@@ -306,7 +306,7 @@ const char kArcTermsURLPath[] = "arc/ter
@@ -311,7 +311,7 @@ const char kArcTermsURLPath[] = "arc/ter
const char kArcPrivacyPolicyURLPath[] = "arc/privacy_policy";
const char kOnlineEulaURLPath[] =
@@ -376,6 +367,17 @@ by default.
const char kTPMFirmwareUpdateLearnMoreURL[] =
"https://support.google.com/chromebook/?p=tpm_update";
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -40,7 +40,7 @@ namespace {
const wchar_t kIePath[] = L"Internet Explorer\\iexplore.exe";
const char kChromeInstallUrl[] =
- "https://google.com/cloudprint/learn/chrome.html";
+ "trk:252:https://google.com/cloudprint/learn/chrome.html";
const wchar_t kCloudPrintRegKey[] = L"Software\\Google\\CloudPrint";
--- a/chromecast/browser/service/cast_service_simple.cc
+++ b/chromecast/browser/service/cast_service_simple.cc
@@ -27,7 +27,7 @@ GURL GetStartupURL() {
@@ -538,7 +540,7 @@ by default.
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -224,10 +224,10 @@ void PasswordStore::GetLogins(const Form
@@ -228,10 +228,10 @@ void PasswordStore::GetLogins(const Form
// TODO(mdm): actually delete them at some point, say M24 or so.
base::Time ignore_logins_cutoff; // the null time
if (form.scheme == PasswordForm::SCHEME_HTML &&
@@ -566,7 +568,7 @@ by default.
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -3046,7 +3046,7 @@
@@ -3071,7 +3071,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -575,7 +577,7 @@ by default.
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
@@ -6690,7 +6690,7 @@
@@ -6717,7 +6717,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -597,7 +599,7 @@ by default.
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -133,7 +133,7 @@
@@ -122,7 +122,7 @@
"google": {
"name": "Google",
"keyword": "google.com",
@@ -705,15 +707,15 @@ by default.
const char kGaiaSid[] = "sid";
--- a/google_apis/gaia/google_service_auth_error.cc
+++ b/google_apis/gaia/google_service_auth_error.cc
@@ -212,7 +212,7 @@ std::string GoogleServiceAuthError::ToSt
@@ -233,7 +233,7 @@ std::string GoogleServiceAuthError::ToSt
case WEB_LOGIN_REQUIRED:
return "Less secure apps may not authenticate with this account. "
"Please visit: "
- "https://www.google.com/settings/security/lesssecureapps";
+ "trk:180:https://www.google.com/settings/security/lesssecureapps";
default:
case HOSTED_NOT_ALLOWED_DEPRECATED:
case NUM_STATES:
NOTREACHED();
return std::string();
--- a/google_apis/gcm/engine/gservices_settings.cc
+++ b/google_apis/gcm/engine/gservices_settings.cc
@@ -29,18 +29,18 @@ const char kRegistrationURLKey[] = "gcm_

6
patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
View File

@@ -42,7 +42,7 @@ the URL so we get notified if this happens again in the future).
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -61,8 +61,7 @@ class SafeBrowsingBlockingPageFactoryImp
@@ -59,8 +59,7 @@ class SafeBrowsingBlockingPageFactoryImp
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
PrefService* prefs = profile->GetPrefs();
@@ -51,10 +51,10 @@ the URL so we get notified if this happens again in the future).
+ bool is_extended_reporting_opt_in_allowed = false;
bool is_proceed_anyway_disabled =
prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
unified_consent::UnifiedConsentService* consent_service =
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -328,7 +328,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -358,7 +358,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {

4
patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
View File

@@ -26,7 +26,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
} // namespace
const int ClientSideDetectionService::kInitialClientModelFetchDelayMs = 10000;
@@ -283,94 +277,8 @@ void ClientSideDetectionService::StartCl
@@ -284,94 +278,8 @@ void ClientSideDetectionService::StartCl
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::unique_ptr<ClientPhishingRequest> request(verdict);
@@ -123,7 +123,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
}
void ClientSideDetectionService::StartClientReportMalwareRequest(
@@ -379,81 +287,8 @@ void ClientSideDetectionService::StartCl
@@ -380,81 +288,8 @@ void ClientSideDetectionService::StartCl
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::unique_ptr<ClientMalwareRequest> request(verdict);

32
patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
View File

@@ -21,7 +21,7 @@
+ url.SchemeIs(url::kTraceScheme) ||
url.SchemeIs(chrome::kChromeNativeScheme) ||
url.SchemeIs(chrome::kChromeSearchScheme) ||
url.SchemeIs(dom_distiller::kDomDistillerScheme))
url.SchemeIs(dom_distiller::kDomDistillerScheme) ||
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows
@@ -59,7 +59,7 @@
return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -385,6 +385,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -386,6 +386,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kHttpsScheme);
RegisterWebSafeScheme(url::kFtpScheme);
RegisterWebSafeScheme(url::kDataScheme);
@@ -83,9 +83,9 @@
#include "url/origin.h"
+#include "url/url_constants.h"
#if BUILDFLAG(ENABLE_REPORTING)
#include "net/network_error_logging/network_error_logging_service.h"
@@ -598,6 +600,12 @@ URLRequest::URLRequest(const GURL& url,
using base::Time;
using std::string;
@@ -602,6 +604,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -133,7 +133,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1665,6 +1665,8 @@ component("net") {
@@ -1692,6 +1692,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -144,7 +144,7 @@
"url_request/url_fetcher_core.cc",
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -61,6 +61,7 @@
@@ -62,6 +62,7 @@
#include "net/ssl/ssl_config_service.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
@@ -152,7 +152,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
@@ -135,6 +136,9 @@ std::unique_ptr<net::URLRequestJobFactor
@@ -137,6 +138,9 @@ std::unique_ptr<net::URLRequestJobFactor
url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
@@ -164,7 +164,7 @@
DCHECK(set_protocol);
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -99,6 +99,7 @@
@@ -97,6 +97,7 @@
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/ftp_protocol_handler.h"
@@ -172,7 +172,7 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
@@ -1143,6 +1144,9 @@ ProfileIOData::SetUpJobFactoryDefaults(
@@ -1097,6 +1098,9 @@ ProfileIOData::SetUpJobFactoryDefaults(
set_protocol = job_factory->SetProtocolHandler(
url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
DCHECK(set_protocol);
@@ -277,7 +277,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
@@ -623,6 +624,8 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -653,6 +654,8 @@ std::unique_ptr<URLRequestContext> URLRe
if (data_enabled_)
job_factory->SetProtocolHandler(url::kDataScheme,
std::make_unique<DataProtocolHandler>());
@@ -288,7 +288,7 @@
if (file_enabled_) {
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -54,6 +54,7 @@ const char* kSecureSchemes[] = {
@@ -55,6 +55,7 @@ const char* kSecureSchemes[] = {
kHttpsScheme,
kAboutScheme,
kDataScheme,
@@ -296,11 +296,11 @@
kWssScheme,
};
@@ -71,6 +72,7 @@ const char* kCORSEnabledSchemes[] = {
kHttpsScheme,
kHttpScheme,
@@ -66,6 +67,7 @@ const char* kNoAccessSchemes[] = {
kAboutScheme,
kJavaScriptScheme,
kDataScheme,
+ kTraceScheme,
};
const char* kWebStorageSchemes[] = {
const char* kCorsEnabledSchemes[] = {

2
patches/core/ungoogled-chromium/disable-domain-reliability.patch
View File

@@ -586,7 +586,7 @@
- if (discard_uploads_ || shutdown_) {
+ if (true) {
VLOG(1) << "Discarding report instead of uploading.";
DVLOG(1) << "Discarding report instead of uploading.";
UploadResult result;
result.status = UploadResult::SUCCESS;
--- a/components/domain_reliability/bake_in_configs.py

6
patches/core/ungoogled-chromium/disable-gaia.patch
View File

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -239,61 +239,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -269,61 +269,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
int load_flags,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -120,7 +120,7 @@
source->AddLocalizedString(
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -348,7 +348,6 @@
@@ -332,7 +332,6 @@
<include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
@@ -128,7 +128,7 @@
<include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
@@ -492,7 +491,6 @@
@@ -453,7 +452,6 @@
<include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
<include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
<include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />

95
patches/core/ungoogled-chromium/disable-google-host-detection.patch
View File

@@ -33,7 +33,7 @@
--- a/components/variations/net/variations_http_headers.cc
+++ b/components/variations/net/variations_http_headers.cc
@@ -27,25 +27,6 @@ namespace variations {
@@ -27,26 +27,6 @@ namespace variations {
namespace {
@@ -48,6 +48,7 @@
- ".googleusercontent.com",
- ".googlevideo.com",
- ".gstatic.com",
- ".litepages.googlezip.net",
- ".ytimg.com",
-};
-
@@ -59,7 +60,7 @@
// The result of checking if a URL should have variations headers appended.
// This enum is used to record UMA histogram values, and should not be
// reordered.
@@ -62,28 +43,6 @@ enum URLValidationResult {
@@ -63,28 +43,6 @@ enum URLValidationResult {
// Checks whether headers should be appended to the |url|, based on the domain
// of |url|. |url| is assumed to be valid, and to have an http/https scheme.
bool IsGoogleDomain(const GURL& url) {
@@ -88,7 +89,7 @@
return false;
}
@@ -100,37 +59,14 @@ void LogUrlValidationHistogram(URLValida
@@ -101,37 +59,14 @@ void LogUrlValidationHistogram(URLValida
void RemoveVariationsHeader(const net::RedirectInfo& redirect_info,
const network::ResourceResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
@@ -126,7 +127,7 @@
return false;
}
@@ -144,8 +80,6 @@ bool AppendVariationHeadersUnknownSigned
@@ -145,8 +80,6 @@ bool AppendVariationHeadersUnknownSigned
void StripVariationHeaderIfNeeded(const GURL& new_location,
net::URLRequest* request) {
@@ -165,9 +166,9 @@
bool TemplateURLRef::ExtractSearchTermsFromURL(
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -43,118 +43,16 @@ namespace {
@@ -45,120 +45,16 @@ bool gUseMockLinkDoctorBaseURLForTesting
bool gUseMockLinkDoctorBaseURLForTesting = false;
bool g_ignore_port_numbers = false;
-bool IsPathHomePageBase(base::StringPiece path) {
- return (path == "/") || (path == "/webhp");
@@ -225,7 +226,8 @@
-// port for its scheme (80 for HTTP, 443 for HTTPS).
-bool IsValidURL(const GURL& url, PortPermission port_permission) {
- return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&
- (url.port().empty() || (port_permission == ALLOW_NON_STANDARD_PORTS));
- (url.port().empty() || g_ignore_port_numbers ||
- (port_permission == ALLOW_NON_STANDARD_PORTS));
-}
-
-bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
@@ -242,9 +244,9 @@
- // same page.
- StripTrailingDot(&tld);
-
- static base::NoDestructor<std::set<std::string>> google_tlds(
- {GOOGLE_TLD_LIST});
- return base::ContainsKey(*google_tlds, tld.as_string());
- static const base::NoDestructor<base::flat_set<base::StringPiece>>
- google_tlds(std::initializer_list<base::StringPiece>({GOOGLE_TLD_LIST}));
- return google_tlds->contains(tld);
-}
-
-// True if |url| is a valid URL with a host that is in the static list of
@@ -257,10 +259,11 @@
- base::StringPiece host(url.host_piece());
- StripTrailingDot(&host);
-
- static base::NoDestructor<std::set<std::string>> google_subdomains(
- {"ipv4.google.com", "ipv6.google.com"});
- static const base::NoDestructor<base::flat_set<base::StringPiece>>
- google_subdomains(std::initializer_list<base::StringPiece>(
- {"ipv4.google.com", "ipv6.google.com"}));
-
- return base::ContainsKey(*google_subdomains, host.as_string());
- return google_subdomains->contains(host);
-}
-
} // namespace
@@ -285,7 +288,7 @@
}
void SetMockLinkDoctorBaseURLForTesting() {
@@ -168,120 +66,50 @@ std::string GetGoogleLocale(const std::s
@@ -172,120 +68,50 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
@@ -460,9 +463,9 @@
bool IsGoogleHostname(const GURL& url) {
--- a/chrome/common/google_url_loader_throttle.cc
+++ b/chrome/common/google_url_loader_throttle.cc
@@ -7,10 +7,6 @@
#include "chrome/common/net/safe_search_util.h"
@@ -8,10 +8,6 @@
#include "components/variations/net/variations_http_headers.h"
#include "services/network/public/cpp/features.h"
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "extensions/common/extension_urls.h"
@@ -470,19 +473,18 @@
-
GoogleURLLoaderThrottle::GoogleURLLoaderThrottle(
bool is_off_the_record,
bool force_safe_search,
@@ -30,34 +26,6 @@ void GoogleURLLoaderThrottle::DetachFrom
chrome::mojom::DynamicParams dynamic_params)
@@ -25,36 +21,6 @@ void GoogleURLLoaderThrottle::DetachFrom
void GoogleURLLoaderThrottle::WillStartRequest(
network::ResourceRequest* request,
bool* defer) {
- if (!is_off_the_record_ &&
- variations::ShouldAppendVariationHeaders(request->url) &&
- !variation_ids_header_.empty()) {
- request->headers.SetHeaderIfMissing(variations::kClientDataHeader,
- variation_ids_header_);
- !dynamic_params_.variation_ids_header.empty()) {
- request->client_data_header = dynamic_params_.variation_ids_header;
- }
-
- if (force_safe_search_) {
- if (dynamic_params_.force_safe_search) {
- GURL new_url;
- safe_search_util::ForceGoogleSafeSearch(request->url, &new_url);
- if (!new_url.is_empty())
@@ -491,44 +493,59 @@
-
- static_assert(safe_search_util::YOUTUBE_RESTRICT_OFF == 0,
- "OFF must be first");
- if (youtube_restrict_ > safe_search_util::YOUTUBE_RESTRICT_OFF &&
- youtube_restrict_ < safe_search_util::YOUTUBE_RESTRICT_COUNT) {
- if (dynamic_params_.youtube_restrict >
- safe_search_util::YOUTUBE_RESTRICT_OFF &&
- dynamic_params_.youtube_restrict <
- safe_search_util::YOUTUBE_RESTRICT_COUNT) {
- safe_search_util::ForceYouTubeRestrict(
- request->url, &request->headers,
- static_cast<safe_search_util::YouTubeRestrictMode>(youtube_restrict_));
- static_cast<safe_search_util::YouTubeRestrictMode>(
- dynamic_params_.youtube_restrict));
- }
-
- if (!allowed_domains_for_apps_.empty() &&
- if (!dynamic_params_.allowed_domains_for_apps.empty() &&
- request->url.DomainIs("google.com")) {
- request->headers.SetHeader(safe_search_util::kGoogleAppsAllowedDomains,
- allowed_domains_for_apps_);
- dynamic_params_.allowed_domains_for_apps);
- }
}
void GoogleURLLoaderThrottle::WillRedirectRequest(
@@ -66,21 +34,6 @@ void GoogleURLLoaderThrottle::WillRedire
@@ -63,33 +29,6 @@ void GoogleURLLoaderThrottle::WillRedire
bool* /* defer */,
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* modified_headers) {
- if (!variations::ShouldAppendVariationHeaders(redirect_info.new_url))
- if (!variations::ShouldAppendVariationHeaders(redirect_info->new_url))
- to_be_removed_headers->push_back(variations::kClientDataHeader);
-
- if (youtube_restrict_ > safe_search_util::YOUTUBE_RESTRICT_OFF &&
- youtube_restrict_ < safe_search_util::YOUTUBE_RESTRICT_COUNT) {
- safe_search_util::ForceYouTubeRestrict(
- redirect_info.new_url, modified_headers,
- static_cast<safe_search_util::YouTubeRestrictMode>(youtube_restrict_));
- // URLLoaderThrottles can only change the redirect URL when the network
- // service is enabled. The non-network service path handles this in
- // ChromeNetworkDelegate.
- if (dynamic_params_.force_safe_search &&
- base::FeatureList::IsEnabled(network::features::kNetworkService)) {
- safe_search_util::ForceGoogleSafeSearch(redirect_info->new_url,
- &redirect_info->new_url);
- }
-
- if (!allowed_domains_for_apps_.empty() &&
- redirect_info.new_url.DomainIs("google.com")) {
- if (dynamic_params_.youtube_restrict >
- safe_search_util::YOUTUBE_RESTRICT_OFF &&
- dynamic_params_.youtube_restrict <
- safe_search_util::YOUTUBE_RESTRICT_COUNT) {
- safe_search_util::ForceYouTubeRestrict(
- redirect_info->new_url, modified_headers,
- static_cast<safe_search_util::YouTubeRestrictMode>(
- dynamic_params_.youtube_restrict));
- }
-
- if (!dynamic_params_.allowed_domains_for_apps.empty() &&
- redirect_info->new_url.DomainIs("google.com")) {
- modified_headers->SetHeader(safe_search_util::kGoogleAppsAllowedDomains,
- allowed_domains_for_apps_);
- dynamic_params_.allowed_domains_for_apps);
- }
}
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -88,17 +41,5 @@ void GoogleURLLoaderThrottle::WillProces
@@ -97,17 +36,5 @@ void GoogleURLLoaderThrottle::WillProces
const GURL& response_url,
network::ResourceResponseHead* response_head,
bool* defer) {
@@ -548,7 +565,7 @@
#endif
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1625,7 +1625,7 @@ void ChromeContentRendererClient::WillDe
@@ -1610,7 +1610,7 @@ void ChromeContentRendererClient::WillDe
bool ChromeContentRendererClient::IsExcludedHeaderForServiceWorkerFetchEvent(
const std::string& header_name) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -330,7 +330,6 @@ if (!is_android && !is_mac) {
@@ -327,7 +327,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
@@ -1268,7 +1267,6 @@ if (is_win) {
@@ -1251,7 +1250,6 @@ if (is_win) {
":swiftshader_library",
":widevine_cdm_library",
"//chrome/app/nibs:chrome_xibs",

2
patches/core/ungoogled-chromium/disable-signin.patch
View File

@@ -2,7 +2,7 @@
--- a/components/signin/core/browser/signin_manager_base.cc
+++ b/components/signin/core/browser/signin_manager_base.cc
@@ -155,7 +155,7 @@ void SigninManagerBase::Initialize(PrefS
@@ -152,7 +152,7 @@ void SigninManagerBase::Initialize(PrefS
bool SigninManagerBase::IsInitialized() const { return initialized_; }
bool SigninManagerBase::IsSigninAllowed() const {

11
patches/core/ungoogled-chromium/disable-translate.patch
View File

@@ -14,17 +14,16 @@
// that settings syncs and we don't want to turn off translate everywhere
--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc
@@ -74,7 +74,9 @@ TranslateHelper::TranslateHelper(content
world_id_(world_id),
@@ -75,8 +75,7 @@ TranslateHelper::TranslateHelper(content
extension_scheme_(extension_scheme),
binding_(this),
- weak_method_factory_(this) {}
+ weak_method_factory_(this) {
weak_method_factory_(this) {
- translate_task_runner_ = this->render_frame()->GetTaskRunner(
- blink::TaskType::kInternalTranslation);
+ CancelPendingTranslation();
+}
}
TranslateHelper::~TranslateHelper() {
}
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -151,9 +151,8 @@ void TranslateScript::OnScriptFetchCompl

6
patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -119,30 +119,11 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -121,30 +121,11 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(meta_data.get());
DCHECK(!upload_done_data.log_path.empty());
@@ -34,7 +34,7 @@
}
void WebRtcLogUploader::PrepareMultipartPostData(
@@ -153,27 +134,7 @@ void WebRtcLogUploader::PrepareMultipart
@@ -155,27 +136,7 @@ void WebRtcLogUploader::PrepareMultipart
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -63,7 +63,7 @@
}
void WebRtcLogUploader::UploadStoredLog(
@@ -239,48 +200,6 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -246,48 +207,6 @@ void WebRtcLogUploader::LoggingStoppedDo
webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.log_path);

29
patches/core/ungoogled-chromium/disable-webstore-urls.patch
View File

@@ -30,7 +30,7 @@
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -89,27 +89,18 @@ const char kNotFromWebstoreInstallSource
@@ -90,27 +90,18 @@ const char kNotFromWebstoreInstallSource
const char kDefaultInstallSource[] = "";
const char kReinstallInstallSource[] = "reinstall";
@@ -58,9 +58,9 @@
- }
+ kMaxRetries + 1);
bool ShouldRetryRequest(network::SimpleURLLoader* loader) {
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -291,12 +282,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -292,12 +283,6 @@ void ExtensionDownloader::DoStartAllPend
ReportStats();
url_stats_ = URLStats();
@@ -73,7 +73,7 @@
fetches_preparing_.clear();
}
@@ -330,23 +315,16 @@ bool ExtensionDownloader::AddExtensionDa
@@ -331,23 +316,16 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -99,7 +99,24 @@
} else {
url_stats_.other_url_count++;
}
@@ -654,20 +632,6 @@ void ExtensionDownloader::HandleManifest
@@ -612,13 +590,9 @@ void ExtensionDownloader::OnManifestLoad
const int error =
response_code == -1 ? loader->NetError() : response_code;
const std::string uma_histogram_name =
- url.DomainIs(kGoogleDotCom)
- ? std::string(
- "Extensions."
- "ExtensionUpdaterFirstUpdateCheckErrorsGoogleUrl")
- : std::string(
- "Extensions."
- "ExtensionUpdaterFirstUpdateCheckErrorsNonGoogleUrl");
+ std::string(
+ "Extensions."
+ "ExtensionUpdaterFirstUpdateCheckErrorsNonGoogleUrl");
const auto& extension_ids =
manifests_queue_.active_request()->extension_ids();
for (auto it = extension_ids.begin(); it != extension_ids.end(); ++it) {
@@ -679,20 +653,6 @@ void ExtensionDownloader::HandleManifest
fetch_data->request_ids()));
}
@@ -120,7 +137,7 @@
NotifyExtensionsDownloadFailed(
no_updates, fetch_data->request_ids(),
ExtensionDownloaderDelegate::NO_UPDATE_AVAILABLE);
@@ -1073,11 +1037,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1098,11 +1058,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

2
patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
View File

@@ -36,7 +36,7 @@
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2993,8 +2993,6 @@ jumbo_split_static_library("ui") {
@@ -2972,8 +2972,6 @@ jumbo_split_static_library("ui") {
"views/relaunch_notification/relaunch_required_dialog_view.cc",
"views/relaunch_notification/relaunch_required_dialog_view.h",
"views/screen_capture_notification_ui_views.cc",

2
patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -4852,20 +4852,7 @@ safe_browsing::UrlCheckerDelegate*
@@ -5009,20 +5009,7 @@ safe_browsing::UrlCheckerDelegate*
ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
content::ResourceContext* resource_context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);

13
patches/core/ungoogled-chromium/remove-third-party-analytics.patch
View File

@@ -1,13 +0,0 @@
# Remove third_party/analytics
# This patch complements binary pruning
--- a/ui/webui/resources/webui_resources.grd
+++ b/ui/webui/resources/webui_resources.grd
@@ -15,7 +15,6 @@ without changes to the corresponding grd
<includes>
<include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml="true" type="BINDATA" compress="gzip" />
<!-- Roboto Font. Roboto-Regular and Roboto-Light is already available on
Android, and Roboto-Medium is not used on Android. All 6 weights of
Roboto are available on Chrome OS.-->

2
patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
View File

@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -131,22 +131,11 @@
@@ -120,22 +120,11 @@
},
"google": {

9
patches/core/ungoogled-chromium/use-local-devtools-files.patch
View File

@@ -5,7 +5,7 @@
--- a/third_party/blink/renderer/devtools/BUILD.gn
+++ b/third_party/blink/renderer/devtools/BUILD.gn
@@ -1162,10 +1162,8 @@ action("generate_devtools_grd") {
@@ -1161,10 +1161,8 @@ action("generate_devtools_grd") {
devtools_embedder_scripts +
[ "$resources_out_dir/devtools_extension_api.js" ]
@@ -30,7 +30,7 @@
}
--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
+++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
@@ -4,7 +4,7 @@
@@ -4,21 +4,21 @@
{ "name": "inspector_main", "type": "autostart" },
{ "name": "mobile_throttling", "type": "autostart" },
@@ -38,8 +38,7 @@
+ { "name": "accessibility" },
{ "name": "animation" },
{ "name": "audits2" },
{ "name": "browser_console" },
@@ -12,14 +12,14 @@
{ "name": "browser_debugger" },
{ "name": "cookie_table" },
{ "name": "devices" },
{ "name": "elements" },
@@ -78,7 +77,7 @@
{ "name": "protocol_monitor"}
--- a/third_party/blink/renderer/devtools/front_end/worker_app.json
+++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
@@ -11,7 +11,7 @@
@@ -10,7 +10,7 @@
{ "name": "help" },
{ "name": "layer_viewer" },
{ "name": "network" },

78
patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
View File

@@ -9,15 +9,15 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -133,6 +133,7 @@
@@ -131,6 +131,7 @@
#include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/leveldatabase/leveldb_features.h"
#include "third_party/libaom/av1_buildflags.h"
+#include "third_party/ungoogled/ungoogled_switches.h"
#include "ui/accessibility/accessibility_switches.h"
#include "ui/base/ui_base_features.h"
#include "ui/base/ui_base_switches.h"
#include "ui/compositor/compositor_switches.h"
@@ -1412,6 +1413,14 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1317,6 +1318,14 @@ const FeatureEntry kFeatureEntries[] = {
"Force punycode hostnames",
"Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).",
kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")},
@@ -34,7 +34,7 @@
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -22,6 +22,7 @@
@@ -23,6 +23,7 @@
#include "services/network/public/cpp/features.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/web_runtime_features.h"
@@ -42,7 +42,7 @@
#include "ui/events/blink/blink_features.h"
#include "ui/gfx/switches.h"
#include "ui/gl/gl_switches.h"
@@ -465,6 +466,11 @@ void SetRuntimeFeaturesDefaultsAndUpdate
@@ -486,6 +487,11 @@ void SetRuntimeFeaturesDefaultsAndUpdate
if (base::FeatureList::IsEnabled(blink::features::kWritableFilesAPI))
WebRuntimeFeatures::EnableFeatureFromString("WritableFiles", true);
@@ -64,7 +64,7 @@
#include "services/metrics/public/cpp/mojo_ukm_recorder.h"
#include "services/metrics/public/cpp/ukm_builders.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
@@ -761,6 +762,15 @@ Document::Document(const DocumentInit& i
@@ -758,6 +759,15 @@ Document::Document(const DocumentInit& i
#ifndef NDEBUG
liveDocumentSet().insert(this);
#endif
@@ -80,7 +80,7 @@
}
Document::~Document() {
@@ -787,6 +797,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -784,6 +794,14 @@ Range* Document::CreateRangeAdjustedToTr
Position::BeforeNode(*shadow_host));
}
@@ -97,7 +97,7 @@
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -427,6 +427,10 @@ class CORE_EXPORT Document : public Cont
@@ -418,6 +418,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -108,7 +108,7 @@
String visibilityState() const;
mojom::PageVisibilityState GetPageVisibilityState() const;
bool hidden() const;
@@ -1780,6 +1784,9 @@ class CORE_EXPORT Document : public Cont
@@ -1776,6 +1780,9 @@ class CORE_EXPORT Document : public Cont
double start_time_;
@@ -120,7 +120,7 @@
HeapVector<Member<ScriptElementBase>> current_script_stack_;
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -1363,6 +1363,11 @@ DOMRectList* Element::getClientRects() {
@@ -1202,6 +1202,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
quads, *element_layout_object);
@@ -132,7 +132,7 @@
return DOMRectList::Create(quads);
}
@@ -1380,6 +1385,9 @@ DOMRect* Element::getBoundingClientRect(
@@ -1219,6 +1224,9 @@ DOMRect* Element::getBoundingClientRect(
DCHECK(element_layout_object);
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -144,7 +144,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1606,11 +1606,21 @@ DOMRectList* Range::getClientRects() con
@@ -1646,11 +1646,21 @@ DOMRectList* Range::getClientRects() con
Vector<FloatQuad> quads;
GetBorderAndTextQuads(quads);
@@ -169,8 +169,8 @@
// TODO(editing-dev): We should make
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -488,6 +488,12 @@
status: "stable",
@@ -507,6 +507,12 @@
name: "FirstContentfulPaintPlusPlus",
},
{
+ name: "FingerprintingClientRectsNoise",
@@ -184,8 +184,8 @@
},
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -576,4 +576,12 @@ void WebRuntimeFeatures::EnableBackgroun
RuntimeEnabledFeatures::SetBackgroundFetchEnabled(enable);
@@ -614,4 +614,12 @@ void WebRuntimeFeatures::EnableGetDispla
RuntimeEnabledFeatures::SetGetDisplayMediaEnabled(enable);
}
+void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -199,10 +199,10 @@
} // namespace blink
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -207,6 +207,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableAutoplayIgnoresWebAudio(bool);
BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
BLINK_PLATFORM_EXPORT static void EnableHrefTranslate(bool);
@@ -221,6 +221,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableTranslateService(bool);
BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -210,7 +210,7 @@
WebRuntimeFeatures();
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1958,6 +1958,7 @@ jumbo_split_static_library("browser") {
@@ -1973,6 +1973,7 @@ jumbo_split_static_library("browser") {
"//third_party/metrics_proto",
"//third_party/re2",
"//third_party/smhasher:cityhash",
@@ -220,7 +220,7 @@
"//third_party/widevine/cdm:buildflags",
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -183,6 +183,7 @@ jumbo_source_set("browser") {
@@ -188,6 +188,7 @@ jumbo_source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -230,7 +230,7 @@
"//third_party/zlib",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -218,6 +218,7 @@
@@ -217,6 +217,7 @@
#include "storage/browser/fileapi/sandbox_file_system_backend.h"
#include "third_party/blink/public/common/page/launching_process_state.h"
#include "third_party/blink/public/public_buildflags.h"
@@ -238,7 +238,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/ui_base_features.h"
#include "ui/base/ui_base_switches.h"
@@ -3062,6 +3063,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3033,6 +3034,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebVR,
switches::kExplicitlyAllowedPorts,
switches::kFileUrlPathAlias,
@@ -249,7 +249,7 @@
switches::kForceGpuMemAvailableMb,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -124,6 +124,7 @@ target(link_target_type, "child") {
@@ -120,6 +120,7 @@ target(link_target_type, "child") {
"//third_party/blink/public:scaled_resources",
"//third_party/blink/public/common",
"//third_party/ced",
@@ -259,17 +259,17 @@
"//ui/events/blink",
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1463,6 +1463,7 @@ jumbo_component("platform") {
@@ -1459,6 +1459,7 @@ jumbo_component("platform") {
"//third_party/blink/public/common",
"//third_party/ced",
"//third_party/icu",
+ "//third_party/ungoogled:switches",
"//ui/gfx",
"//ui/gfx/geometry",
]
"//third_party/webrtc/p2p:rtc_p2p",
"//third_party/webrtc_overrides:init_webrtc",
"//third_party/zlib/google:compression_utils",
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -782,8 +782,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -783,8 +783,15 @@ TextMetrics* CanvasRenderingContext2D::m
else
direction = ToTextDirection(GetState().GetDirection(), canvas());
@@ -288,9 +288,9 @@
void CanvasRenderingContext2D::DrawTextInternal(
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
@@ -68,6 +68,8 @@ class CORE_EXPORT TextMetrics final : pu
@@ -71,6 +71,8 @@ class CORE_EXPORT TextMetrics final : pu
static float GetFontBaseline(const TextBaseline&, const SimpleFontData&);
void Trace(blink::Visitor*) override;
+ void Shuffle(const double factor);
+
@@ -299,9 +299,9 @@
const TextDirection&,
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -38,6 +38,24 @@ float TextMetrics::GetFontBaseline(const
return 0;
}
@@ -45,6 +45,24 @@ void TextMetrics::Trace(blink::Visitor*
TextMetrics::TextMetrics() : baselines_(Baselines::Create()) {}
+void TextMetrics::Shuffle(const double factor) {
+ // x-direction
@@ -316,9 +316,9 @@
+ actual_bounding_box_descent_ *= factor;
+ em_height_ascent_ *= factor;
+ em_height_descent_ *= factor;
+ baselines_.setAlphabetic(baselines_.alphabetic() * factor);
+ baselines_.setHanging(baselines_.hanging() * factor);
+ baselines_.setIdeographic(baselines_.ideographic() * factor);
+ baselines_->setAlphabetic(baselines_->alphabetic() * factor);
+ baselines_->setHanging(baselines_->hanging() * factor);
+ baselines_->setIdeographic(baselines_->ideographic() * factor);
+}
+
void TextMetrics::Update(const Font& font,

18
patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
View File

@@ -66,7 +66,7 @@ approach to change color components.
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/GrContext.h"
+#include "third_party/skia/src/core/SkColorData.h"
+#include "third_party/skia/include/private/SkColorData.h"
namespace blink {
@@ -249,7 +249,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1426,6 +1426,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1331,6 +1331,10 @@ const FeatureEntry kFeatureEntries[] = {
"Enable Canvas::measureText() fingerprint deception",
"Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.",
kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
@@ -262,7 +262,7 @@ approach to change color components.
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -470,6 +470,8 @@ void SetRuntimeFeaturesDefaultsAndUpdate
@@ -491,6 +491,8 @@ void SetRuntimeFeaturesDefaultsAndUpdate
command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(
command_line.HasSwitch(switches::kFingerprintingCanvasMeasureTextNoise));
@@ -273,7 +273,7 @@ approach to change color components.
// Do not add individual features below this line.
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -494,6 +494,9 @@
@@ -513,6 +513,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{
@@ -285,7 +285,7 @@ approach to change color components.
},
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -584,4 +584,8 @@ void WebRuntimeFeatures::EnableFingerpri
@@ -622,4 +622,8 @@ void WebRuntimeFeatures::EnableFingerpri
RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
}
@@ -296,8 +296,8 @@ approach to change color components.
} // namespace blink
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -209,6 +209,7 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableHrefTranslate(bool);
@@ -223,6 +223,7 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool);
@@ -306,7 +306,7 @@ approach to change color components.
WebRuntimeFeatures();
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3065,6 +3065,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3036,6 +3036,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -316,7 +316,7 @@ approach to change color components.
switches::kForceGpuMemAvailableMb,
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1432,7 +1432,9 @@ jumbo_component("platform") {
@@ -1429,7 +1429,9 @@ jumbo_component("platform") {
"//third_party/blink/renderer:non_test_config",
]

24
patches/extra/bromite/flag-max-connections-per-host.patch
View File

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -980,6 +980,11 @@ const FeatureEntry::Choice kForceEffecti
@@ -928,6 +928,11 @@ const FeatureEntry::Choice kForceEffecti
net::kEffectiveConnectionType4G},
};
@@ -29,7 +29,7 @@ with limited CPU/memory resources and it is disabled by default.
// Ensure that all effective connection types returned by Network Quality
// Estimator (NQE) are also exposed via flags.
static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
@@ -2647,6 +2652,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2535,6 +2540,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kMaterialDesignIncognitoNTPName,
flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
@@ -41,7 +41,7 @@ with limited CPU/memory resources and it is disabled by default.
flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll,
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1129,6 +1129,10 @@ const char kMaterialDesignIncognitoNTPDe
@@ -1218,6 +1218,10 @@ const char kMaterialDesignIncognitoNTPDe
"If enabled, the Incognito New Tab page uses the new material design with "
"a better readable text.";
@@ -54,7 +54,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -701,6 +701,9 @@ extern const char kMarkHttpAsWarningAndD
@@ -739,6 +739,9 @@ extern const char kMarkHttpAsWarningAndD
extern const char kMaterialDesignIncognitoNTPName[];
extern const char kMaterialDesignIncognitoNTPDescription[];
@@ -73,9 +73,9 @@ with limited CPU/memory resources and it is disabled by default.
+const char kMaxConnectionsPerHostChoiceDefault[] = "6",
+ kMaxConnectionsPerHostChoice15[] = "15";
+
const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kDnsOverHttps{"dns-over-https",
base::FEATURE_DISABLED_BY_DEFAULT};
--- a/components/network_session_configurator/common/network_features.h
+++ b/components/network_session_configurator/common/network_features.h
@@ -10,6 +10,10 @@
@@ -86,9 +86,9 @@ with limited CPU/memory resources and it is disabled by default.
+ kMaxConnectionsPerHostChoice6[],
+ kMaxConnectionsPerHostChoice15[];
+
// Enables Channel ID.
NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
// Enabled DNS over HTTPS
// (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
--- a/components/network_session_configurator/common/network_switch_list.h
+++ b/components/network_session_configurator/common/network_switch_list.h
@@ -21,6 +21,10 @@ NETWORK_SWITCH(kEnableUserAlternateProto
@@ -119,7 +119,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/post_task.h"
#include "base/task/task_traits.h"
@@ -97,6 +99,7 @@
@@ -98,6 +100,7 @@
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
#include "components/net_log/chrome_net_log.h"
@@ -127,7 +127,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/optimization_guide/optimization_guide_service.h"
#include "components/policy/core/common/policy_service.h"
@@ -309,6 +312,18 @@ void BrowserProcessImpl::Init() {
@@ -312,6 +315,18 @@ void BrowserProcessImpl::Init() {
base::Unretained(this)));
#endif
@@ -148,7 +148,7 @@ with limited CPU/memory resources and it is disabled by default.
net::HttpNetworkSession::NORMAL_SOCKET_POOL,
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1805,6 +1805,7 @@ jumbo_split_static_library("browser") {
@@ -1820,6 +1820,7 @@ jumbo_split_static_library("browser") {
"//components/net_log",
"//components/network_hints/common",
"//components/network_session_configurator/browser",

2
patches/extra/debian_buster/disable/android.patch
View File

@@ -13,7 +13,7 @@ author: Michael Gilbert <mgilbert@debian.org>
# TODO(733935): Enable for other Android architectures too. Currently we only
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -359,7 +359,7 @@ group("gn_all") {
@@ -369,7 +369,7 @@ group("gn_all") {
# seems currently broken for this platform at the moment, and the
# corresponding code build and works on Linux unmodified.
# See instructions in the corresponding BUILD.gn.

8
patches/extra/debian_buster/disable/fuzzers.patch
View File

@@ -3,19 +3,19 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -700,8 +700,7 @@ group("gn_all") {
@@ -722,8 +722,7 @@ group("gn_all") {
}
}
- if ((is_linux && !is_chromeos && !is_chromecast) ||
- if ((is_linux && !is_chromecast) ||
- (is_win && (use_drfuzz || use_libfuzzer)) || (use_libfuzzer && is_mac)) {
+ if (false) {
deps += [
"//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
"//third_party/icu/fuzzers",
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2229,9 +2229,3 @@ test("content_perftests") {
@@ -2232,9 +2232,3 @@ test("content_perftests") {
deps += [ "//testing/android/native_test:native_test_native_code" ]
}
}

2
patches/extra/debian_buster/disable/google-api-warning.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -790,10 +790,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -805,10 +805,6 @@ void StartupBrowserCreatorImpl::AddInfoB
chrome::ShowBadFlagsPrompt(web_contents);
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents);

2
patches/extra/debian_buster/disable/welcome-page.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1078,7 +1078,7 @@ void ProfileManager::InitProfileUserPref
@@ -1071,7 +1071,7 @@ void ProfileManager::InitProfileUserPref
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
supervised_user_id);
}

2
patches/extra/debian_buster/fixes/connection-message.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/864539
--- a/components/error_page_strings.grdp
+++ b/components/error_page_strings.grdp
@@ -67,7 +67,7 @@
@@ -73,7 +73,7 @@
</message>
<message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY" desc="When a page fails to load, sometimes we suggest checking the network connections. This contains details below the suggestion.">
Check any cables and reboot any routers, modems, or other network

9
patches/extra/debian_buster/fixes/inspector.patch
View File

@@ -12,12 +12,3 @@ author: Michael Gilbert <mgilbert@debian.org>
import("$_inspector_protocol/inspector_protocol.gni")
_protocol_generated = [
@@ -30,7 +30,7 @@ _protocol_generated = [
action("protocol_compatibility") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
- script = "$_inspector_protocol/CheckProtocolCompatibility.py"
+ script = "$_inspector_protocol/check_protocol_compatibility.py"
inputs = [
"js_protocol.json",
]

18
patches/extra/debian_buster/fixes/polymer.patch
View File

@@ -1,18 +0,0 @@
description: use polymer from chromium's top level third_party directory
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/catapult/tracing/trace_viewer.gypi
+++ b/third_party/catapult/tracing/trace_viewer.gypi
@@ -18,9 +18,9 @@
'tracing/ui/tracks/track.css',
],
'tracing_js_html_files': [
- '../third_party/polymer/components/polymer/polymer-micro.html',
- '../third_party/polymer/components/polymer/polymer-mini.html',
- '../third_party/polymer/components/polymer/polymer.html',
+ '../../polymer/v1_0/components-chromium/polymer/polymer-micro.html',
+ '../../polymer/v1_0/components-chromium/polymer/polymer-mini.html',
+ '../../polymer/v1_0/components-chromium/polymer/polymer.html',
'tracing/base/base.html',
'tracing/base/base64.html',
'tracing/base/category_util.html',

8
patches/extra/debian_buster/gn/parallel.patch
View File

@@ -3,15 +3,15 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -51,6 +51,7 @@ def main(argv):
action='store_true',
help='Download and build with the Debian sysroot.')
@@ -47,6 +47,7 @@ def main(argv):
help='The directory in which to build gn, '
'relative to the src directory. (eg. out/Release)')
parser.add_option('-v', '--verbose', help='ignored')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
parser.add_option(
'--skip-generate-buildfiles',
action='store_true',
@@ -84,8 +85,12 @@ def main(argv):
@@ -78,8 +79,12 @@ def main(argv):
shutil.copy2(
os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)

2
patches/extra/debian_buster/system/fontconfig.patch
View File

@@ -10,7 +10,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -206,7 +206,7 @@ static_library("test_support") {
deps += [ "//third_party/fuchsia-sdk:zx" ]
deps += [ "//third_party/fuchsia-sdk/sdk:zx" ]
}
- if (is_linux) {

4
patches/extra/debian_buster/warnings/sequence-point.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/headless/lib/browser/protocol/browser_handler.cc
+++ b/headless/lib/browser/protocol/browser_handler.cc
@@ -75,7 +75,7 @@ Response BrowserHandler::Close() {
@@ -78,7 +78,7 @@ Response BrowserHandler::Close() {
Response BrowserHandler::SetWindowBounds(
int window_id,
std::unique_ptr<Browser::Bounds> window_bounds) {
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
return Response::Error("Browser window not found");
--- a/third_party/webrtc/modules/audio_processing/aec3/reverb_decay_estimator.cc
+++ b/third_party/webrtc/modules/audio_processing/aec3/reverb_decay_estimator.cc
@@ -285,7 +285,7 @@ void ReverbDecayEstimator::LateReverbLin
@@ -287,7 +287,7 @@ void ReverbDecayEstimator::LateReverbLin
// Arithmetic sum of $2 \sum_{i=0.5}^{(N-1)/2}i^2$ calculated directly.
nn_ = SymmetricArithmetricSum(N);
// The linear regression approach assumes symmetric index around 0.

16
patches/extra/inox-patchset/0006-modify-default-prefs.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1029,7 +1029,7 @@ void ChromeContentBrowserClient::Registe
@@ -1034,7 +1034,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -27,9 +27,9 @@
registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
--- a/chrome/browser/net/prediction_options.cc
+++ b/chrome/browser/net/prediction_options.cc
@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPr
return NetworkPredictionStatus::ENABLED;
@@ -32,7 +32,7 @@ NetworkPredictionStatus CanPrefetchAndPr
}
return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK;
default:
- DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
+ //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
@@ -82,7 +82,7 @@
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -91,10 +91,10 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -132,10 +132,10 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillBillingCustomerNumber, 0.0,
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
registry->RegisterBooleanPref(
@@ -95,7 +95,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterIntegerPref(
prefs::kAutofillLastVersionDeduped, 0,
@@ -103,7 +103,7 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -148,7 +148,7 @@ void RegisterProfilePrefs(user_prefs::Pr
prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -117,7 +117,7 @@
</cr-dialog>
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -352,8 +352,8 @@ void ForceWebBasedSigninFlowForTesting(b
@@ -353,8 +353,8 @@ void ForceWebBasedSigninFlowForTesting(b
void RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -199,7 +199,7 @@
// functionality that are only available in chrome://extensions/ but which
--- a/components/safe_browsing/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/common/safe_browsing_prefs.cc
@@ -229,9 +229,9 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -149,9 +149,9 @@ void RegisterProfilePrefs(PrefRegistrySi
registry->RegisterBooleanPref(
prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
registry->RegisterBooleanPref(
@@ -213,7 +213,7 @@
false);
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -363,10 +363,10 @@ void RecordParsingOnSavingDifference(
@@ -321,10 +321,10 @@ void RecordParsingOnSavingDifference(
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

8
patches/extra/inox-patchset/0008-restore-classic-ntp.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -187,29 +187,7 @@ struct NewTabURLDetails {
@@ -190,29 +190,7 @@ struct NewTabURLDetails {
const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
@@ -33,7 +33,7 @@
const GURL url;
--- a/components/ntp_snippets/features.cc
+++ b/components/ntp_snippets/features.cc
@@ -35,13 +35,13 @@ const base::Feature* const kAllFeatures[
@@ -34,13 +34,13 @@ const base::Feature* const kAllFeatures[
&kRemoteSuggestionsBackendFeature};
const base::Feature kArticleSuggestionsFeature{
@@ -48,5 +48,5 @@
- base::FEATURE_ENABLED_BY_DEFAULT};
+ base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kForeignSessionsSuggestionsFeature{
"NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kBreakingNewsPushFeature{"BreakingNewsPush",
base::FEATURE_DISABLED_BY_DEFAULT};

2
patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch
View File

@@ -30,7 +30,7 @@
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -51,548 +51,548 @@ namespace {
@@ -33,548 +33,548 @@ namespace {
// Default (for countries with no better engine set)
const PrepopulatedEngine* const engines_default[] = {

2
patches/extra/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
@@ -66,7 +66,7 @@ StartupTabProviderImpl::StandardOnboardi
@@ -61,7 +61,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
// Onboarding content has not been launched on Chrome OS.

2
patches/extra/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
@@ -1595,8 +1595,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1572,8 +1572,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

2
patches/extra/iridium-browser/updater-disable-auto-update.patch
View File

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -670,7 +670,7 @@ static base::mac::ScopedObjCClassSwizzle
@@ -665,7 +665,7 @@ static base::mac::ScopedObjCClassSwizzle
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

2
patches/extra/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
@@ -1391,6 +1391,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1296,6 +1296,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")},

6
patches/extra/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
@@ -206,6 +206,16 @@ const unsigned kOsDesktop = kOsMac | kOs
@@ -210,6 +210,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::kGenericExperimentChoiceDisabled, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -1373,6 +1383,10 @@ const FeatureEntry::FeatureVariation kOf
@@ -1278,6 +1288,10 @@ const FeatureEntry::FeatureVariation kOf
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -75,7 +75,7 @@
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
@@ -144,6 +145,13 @@ bool ExtensionManagement::IsInstallation
@@ -151,6 +152,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

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

@@ -1,15 +0,0 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2253,11 +2253,11 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-wifi-credential-sync", flag_descriptions::kWifiCredentialSyncName,
flag_descriptions::kWifiCredentialSyncDescription, kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)},
+#endif // OS_CHROMEOS
{"enable-potentially-annoying-security-features",
flag_descriptions::kExperimentalSecurityFeaturesName,
flag_descriptions::kExperimentalSecurityFeaturesDescription, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)},
-#endif // OS_CHROMEOS
{"ssl-committed-interstitials",
flag_descriptions::kSSLCommittedInterstitialsName,
flag_descriptions::kSSLCommittedInterstitialsDescription, kOsAll,

2
patches/extra/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
@@ -1395,6 +1395,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1300,6 +1300,10 @@ const FeatureEntry kFeatureEntries[] = {
"Disable search engine collection",
"Prevents search engines from being added automatically.",
kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},

2
patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -767,7 +767,8 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -782,7 +782,8 @@ void StartupBrowserCreatorImpl::AddInfoB
if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
return;

6
patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -216,6 +216,19 @@ const FeatureEntry::Choice kExtensionHan
@@ -220,6 +220,19 @@ const FeatureEntry::Choice kExtensionHan
"always-prompt-for-install"},
};
@@ -20,7 +20,7 @@
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -4447,6 +4460,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4378,6 +4391,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(arc::kEnableUnifiedAudioFocusFeature)},
#endif // defined(OS_CHROMEOS)
@@ -34,7 +34,7 @@
// Histograms" in tools/metrics/histograms/README.md (run the
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -212,12 +212,27 @@ void ToolbarView::Init() {
@@ -214,12 +214,27 @@ void ToolbarView::Init() {
cast_ = media_router::CastToolbarButton::Create(browser_).release();
}

4
patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -61,14 +61,13 @@ using content::WebContents;
@@ -63,14 +63,13 @@ using content::WebContents;
namespace {
bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
@@ -22,7 +22,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1373,6 +1373,10 @@ const FeatureEntry::FeatureVariation kOf
@@ -1278,6 +1278,10 @@ const FeatureEntry::FeatureVariation kOf
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {

12
patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
View File

@@ -3,7 +3,7 @@
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -28,6 +28,7 @@
@@ -29,6 +29,7 @@
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/callback_helpers.h"
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/containers/linked_list.h"
#include "base/debug/debugger.h"
@@ -115,11 +116,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -118,11 +119,6 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -20,10 +20,10 @@
- { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
-
// We use a separate histogram name for each platform to facilitate the
// display of error codes by their symbolic name (since each platform has
// different mappings).
@@ -2720,7 +2716,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
enum DnsResolveStatus {
RESOLVE_STATUS_DNS_SUCCESS = 0,
RESOLVE_STATUS_PROC_SUCCESS,
@@ -2774,7 +2770,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
last_ipv6_probe_result_ =

24
patches/extra/ungoogled-chromium/clear-http-auth-cache-menu-item.patch
View File

@@ -7,12 +7,12 @@
#define IDC_DEV_TOOLS_INSPECT 40023
#define IDC_UPGRADE_DIALOG 40024
+#define IDC_CLEAR_HTTP_AUTH_CACHE 40026
#define IDC_SHOW_KEYBOARD_OVERLAY 40027
#define IDC_PROFILING_ENABLED 40028
#define IDC_BOOKMARKS_MENU 40029
#define IDC_SHOW_SIGNIN 40030
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1067,6 +1067,9 @@ are declared in tools/grit/grit_rule.gni
@@ -1082,6 +1082,9 @@ are declared in tools/grit/grit_rule.gni
<message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
&amp;Clear browsing data...
</message>
@@ -22,7 +22,7 @@
<message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
&amp;Downloads
</message>
@@ -1105,6 +1108,9 @@ are declared in tools/grit/grit_rule.gni
@@ -1123,6 +1126,9 @@ are declared in tools/grit/grit_rule.gni
<message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
&amp;Clear Browsing Data...
</message>
@@ -34,7 +34,7 @@
</message>
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -206,6 +206,7 @@ void ToolsMenuModel::Build(Browser* brow
@@ -211,6 +211,7 @@ void ToolsMenuModel::Build(Browser* brow
AddSeparator(ui::NORMAL_SEPARATOR);
AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
@@ -42,7 +42,7 @@
AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
if (chrome::CanOpenTaskManager())
AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
@@ -465,6 +466,13 @@ void AppMenuModel::LogMenuMetrics(int co
@@ -474,6 +475,13 @@ void AppMenuModel::LogMenuMetrics(int co
}
LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
break;
@@ -58,7 +58,7 @@
UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ViewSource", delta);
--- a/chrome/browser/ui/toolbar/app_menu_model.h
+++ b/chrome/browser/ui/toolbar/app_menu_model.h
@@ -76,6 +76,7 @@ enum AppMenuAction {
@@ -77,6 +77,7 @@ enum AppMenuAction {
MENU_ACTION_OPEN_IN_CHROME = 48,
MENU_ACTION_SITE_SETTINGS = 49,
MENU_ACTION_APP_INFO = 50,
@@ -78,7 +78,7 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -61,6 +61,9 @@
@@ -63,6 +63,9 @@
#include "extensions/browser/extension_system.h"
#include "printing/buildflags/buildflags.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -98,7 +98,7 @@
case IDC_IMPORT_SETTINGS:
ShowImportDialog(browser_);
break;
@@ -890,6 +896,7 @@ void BrowserCommandController::InitComma
@@ -903,6 +909,7 @@ void BrowserCommandController::InitComma
!profile()->IsOffTheRecord());
command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
!guest_session);
@@ -108,7 +108,7 @@
#else
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -135112,6 +135112,7 @@ uploading your change for review.
@@ -140502,6 +140502,7 @@ uploading your change for review.
<suffix name="Cast"/>
<suffix name="ChromeOSRestart"/>
<suffix name="ClearBrowsingData"/>
@@ -118,7 +118,7 @@
<suffix name="CreateHostedApp"/>
--- a/net/http/http_auth_cache.cc
+++ b/net/http/http_auth_cache.cc
@@ -283,6 +283,10 @@ bool HttpAuthCache::Remove(const GURL& o
@@ -249,6 +249,10 @@ bool HttpAuthCache::Remove(const GURL& o
return false;
}
@@ -131,7 +131,7 @@
ClearAllEntries();
--- a/net/http/http_auth_cache.h
+++ b/net/http/http_auth_cache.h
@@ -176,6 +176,8 @@ class NET_EXPORT HttpAuthCache {
@@ -177,6 +177,8 @@ class NET_EXPORT HttpAuthCache {
HttpAuth::Scheme scheme,
const AuthCredentials& credentials);
@@ -142,7 +142,7 @@
void ClearEntriesAddedSince(base::Time begin_time);
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -53808,6 +53808,7 @@ Full version information for the fingerp
@@ -55212,6 +55212,7 @@ Full version information for the fingerp
<int value="48" label="Open in Chrome"/>
<int value="49" label="Site Settings"/>
<int value="50" label="App Info"/>

2
patches/extra/ungoogled-chromium/default-to-https-scheme.patch
View File

@@ -51,7 +51,7 @@
void AutocompleteInput::UpdateText(const base::string16& text,
--- a/components/omnibox/browser/autocomplete_provider.cc
+++ b/components/omnibox/browser/autocomplete_provider.cc
@@ -188,11 +188,11 @@ size_t AutocompleteProvider::TrimHttpPre
@@ -339,11 +339,11 @@ size_t AutocompleteProvider::TrimHttpPre
if (!AutocompleteInput::HasHTTPScheme(*url))
return 0;
size_t scheme_pos =

2
patches/extra/ungoogled-chromium/disable-download-quarantine.patch
View File

@@ -88,7 +88,7 @@
-#endif // !WIN && !MAC && !LINUX
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -47,7 +47,6 @@ jumbo_source_set("browser") {
@@ -49,7 +49,6 @@ jumbo_source_set("browser") {
"//components/discardable_memory/service",
"//components/download/database",
"//components/download/public/common:public",

4
patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
View File

@@ -11,17 +11,17 @@
-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
-const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
+const FormatUrlType kFormatUrlOmitNothing = 1;
+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
const FormatUrlType kFormatUrlOmitDefaults =
kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |

6
patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
View File

@@ -2,7 +2,7 @@
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -24,11 +24,7 @@ bool HasWebUIScheme(const GURL& url) {
@@ -25,11 +25,7 @@ bool HasWebUIScheme(const GURL& url) {
}
bool IsSavableURL(const GURL& url) {
@@ -17,7 +17,7 @@
bool IsURLHandledByNetworkStack(const GURL& url) {
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -367,12 +367,6 @@ int GetContentRestrictions(const Browser
@@ -369,12 +369,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -30,7 +30,7 @@
if (current_tab->ShowingInterstitialPage())
content_restrictions |= CONTENT_RESTRICTION_PRINT;
}
@@ -922,8 +916,7 @@ bool CanSavePage(const Browser* browser)
@@ -931,8 +925,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}

24
patches/extra/ungoogled-chromium/no-such-option-no-sysroot.patch
View File

@@ -1,24 +0,0 @@
# Removes the --no-sysroot option, not a valid option anymore
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -46,10 +46,6 @@ def main(argv):
'--build-path',
help='The directory in which to build gn, '
'relative to the src directory. (eg. out/Release)')
- parser.add_option(
- '--with-sysroot',
- action='store_true',
- help='Download and build with the Debian sysroot.')
parser.add_option('-v', '--verbose', help='ignored')
parser.add_option('-j', '--jobs', help='Number of jobs')
parser.add_option(
@@ -77,8 +73,6 @@ def main(argv):
'--no-last-commit-position',
'--out-path=' + gn_build_dir,
]
- if not options.with_sysroot:
- cmd.append('--no-sysroot')
if options.debug:
cmd.append('--debug')
subprocess.check_call(cmd)

2
patches/extra/ungoogled-chromium/popups-to-tabs.patch
View File

@@ -2,7 +2,7 @@
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -298,7 +298,7 @@ WindowOpenDisposition RenderViewImpl::Na
@@ -292,7 +292,7 @@ WindowOpenDisposition RenderViewImpl::Na
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

2
patches/extra/ungoogled-chromium/searx.patch
View File

@@ -32,7 +32,7 @@
};
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -51,549 +51,549 @@ namespace {
@@ -33,549 +33,549 @@ namespace {
// Default (for countries with no better engine set)
const PrepopulatedEngine* const engines_default[] = {

2
patches/pending_relocate/debian_buster/disable/installer.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -65,7 +65,6 @@ group("gn_all") {
@@ -66,7 +66,6 @@ group("gn_all") {
":gn_visibility",
"//base:base_perftests",
"//base:base_unittests",

2
patches/pending_relocate/debian_buster/disable/openh264.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/webrtc.gni
+++ b/third_party/webrtc/webrtc.gni
@@ -149,7 +149,7 @@ declare_args() {
@@ -153,7 +153,7 @@ declare_args() {
# H.264, compilation succeeds but |H264DecoderImpl| fails to initialize.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/

2
patches/pending_relocate/debian_buster/disable/swiftshader.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -430,7 +430,7 @@ group("gn_all") {
@@ -449,7 +449,7 @@ group("gn_all") {
]
}

4
patches/pending_relocate/debian_buster/fixes/as-needed.patch
View File

@@ -3,8 +3,8 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -397,7 +397,7 @@ config("compiler") {
if (!using_sanitizer && !is_safestack) {
@@ -396,7 +396,7 @@ config("compiler") {
if (!using_sanitizer) {
ldflags += [
"-Wl,-z,defs",
- "-Wl,--as-needed",

21
patches/pending_relocate/debian_buster/fixes/autocompletematch.patch
View File

@@ -1,21 +0,0 @@
description: AutocompleteMatch cannot copy construct from a nullptr
author: Michael Gilbert <mgilbert@debian.org>
--- a/components/omnibox/browser/autocomplete_match.cc
+++ b/components/omnibox/browser/autocomplete_match.cc
@@ -141,14 +141,13 @@ AutocompleteMatch::AutocompleteMatch(con
? new AutocompleteMatch(*match.associated_keyword)
: nullptr),
keyword(match.keyword),
- pedal(match.pedal),
from_previous(match.from_previous),
search_terms_args(
match.search_terms_args
? new TemplateURLRef::SearchTermsArgs(*match.search_terms_args)
: nullptr),
additional_info(match.additional_info),
- duplicate_matches(match.duplicate_matches) {}
+ duplicate_matches(match.duplicate_matches) { pedal = match.pedal; }
AutocompleteMatch::~AutocompleteMatch() {
}

14
patches/pending_relocate/debian_buster/fixes/constexpr.patch
View File

@@ -1,14 +0,0 @@
description: add constexpr to methods where it is required
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/core/animation/animation_time_delta.h
+++ b/third_party/blink/renderer/core/animation/animation_time_delta.h
@@ -53,7 +53,7 @@ class CORE_EXPORT AnimationTimeDelta {
return AnimationTimeDelta(std::numeric_limits<double>::infinity());
}
- double InSecondsF() const { return delta_; }
+ constexpr double InSecondsF() const { return delta_; }
double InMillisecondsF() const { return delta_ * 1000; }
bool is_max() const {

21
patches/pending_relocate/debian_buster/fixes/constructor.patch
View File

@@ -1,21 +0,0 @@
description: constructor of Algorithm needs to be public
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/core/streams/transform_stream.cc
+++ b/third_party/blink/renderer/core/streams/transform_stream.cc
@@ -37,7 +37,6 @@ class TransformStream::Algorithm : publi
ScriptFunction::Trace(visitor);
}
- protected:
Algorithm(TransformStreamTransformer* transformer,
ScriptState* script_state,
ExceptionState& exception_state)
@@ -46,6 +45,7 @@ class TransformStream::Algorithm : publi
interface_name_(exception_state.InterfaceName()),
property_name_(exception_state.PropertyName()) {}
+ protected:
// AlgorithmScope holds the stack-allocated objects used by the CallRaw()
// methods for FlushAlgorithm and TransformAlgorithm.
class AlgorithmScope {

8
patches/pending_relocate/debian_buster/fixes/empty-array.patch
View File

@@ -1,8 +1,8 @@
description: arraysize macro fails for zero length array, add one character
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/text/character_property_data_generator.h
+++ b/third_party/blink/renderer/platform/text/character_property_data_generator.h
--- a/third_party/blink/renderer/platform/text/character_property_data.h
+++ b/third_party/blink/renderer/platform/text/character_property_data.h
@@ -244,10 +244,10 @@ static const UChar32 kIsHangulRanges[] =
0xD7B0, 0xD7FF,
// Halfwidth Hangul Jamo
@@ -14,5 +14,5 @@ author: Michael Gilbert <mgilbert@debian.org>
-static const UChar32 kIsHangulArray[] = {};
+static const UChar32 kIsHangulArray[] = {0xFFDC};
} // namespace blink
#if !defined(USING_SYSTEM_ICU)
// Freezed trie tree, see character_property_data_generator.cc.

2
patches/pending_relocate/debian_buster/fixes/gpu-timeout.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/gpu/ipc/service/gpu_watchdog_thread.cc
+++ b/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -42,7 +42,7 @@ const int kGpuTimeout = 30000;
@@ -44,7 +44,7 @@ const int kGpuTimeout = 30000;
// infected machines.
const int kGpuTimeout = 15000;
#else

20
patches/pending_relocate/debian_buster/fixes/mojo.patch
View File

@@ -12,7 +12,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"browser/layout_test/secondary_test_window_observer.cc",
"browser/layout_test/secondary_test_window_observer.h",
"browser/layout_test/test_info_extractor.cc",
@@ -287,9 +285,7 @@ jumbo_static_library("content_shell_lib"
@@ -289,9 +287,7 @@ jumbo_static_library("content_shell_lib"
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
@@ -24,7 +24,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"//device/bluetooth:fake_bluetooth",
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -23,7 +23,6 @@
@@ -30,7 +30,6 @@
#include "content/shell/browser/layout_test/layout_test_browser_context.h"
#include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
#include "content/shell/browser/layout_test/layout_test_message_filter.h"
@@ -32,7 +32,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/common/layout_test/layout_test_switches.h"
#include "content/shell/common/shell_messages.h"
@@ -41,11 +40,6 @@ namespace {
@@ -47,11 +46,6 @@ namespace {
LayoutTestContentBrowserClient* g_layout_test_browser_client;
@@ -41,18 +41,18 @@ author: Michael Gilbert <mgilbert@debian.org>
- MojoLayoutTestHelper::Create(std::move(request));
-}
-
class WebPackageInternalsImpl : public blink::test::mojom::WebPackageInternals {
class TestOverlayWindow : public OverlayWindow {
public:
explicit WebPackageInternalsImpl(WebPackageContext* web_package_context)
@@ -183,7 +177,6 @@ void LayoutTestContentBrowserClient::Exp
&WebPackageInternalsImpl::Create,
base::Unretained(
render_process_host->GetStoragePartition()->GetWebPackageContext())));
TestOverlayWindow() = default;
@@ -157,7 +151,6 @@ void LayoutTestContentBrowserClient::Exp
&LayoutTestContentBrowserClient::CreateFakeBluetoothChooser,
base::Unretained(this)),
ui_task_runner);
- registry->AddInterface(base::BindRepeating(&MojoLayoutTestHelper::Create));
registry->AddInterface(
base::BindRepeating(&LayoutTestContentBrowserClient::BindClipboardHost,
base::Unretained(this)),
@@ -305,7 +298,6 @@ bool LayoutTestContentBrowserClient::Can
@@ -314,7 +307,6 @@ bool LayoutTestContentBrowserClient::Can
void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
registry) {

15
patches/pending_relocate/debian_buster/fixes/ownership-error.patch
View File

@@ -1,15 +0,0 @@
description: upstream tries to use a unique_ptr that has already been moved
author: Michael Gilbert <mgilbert@debian.org>
--- a/services/resource_coordinator/coordination_unit/coordination_unit_base.cc
+++ b/services/resource_coordinator/coordination_unit/coordination_unit_base.cc
@@ -81,7 +81,8 @@ void CoordinationUnitBase::SetProperty(m
// static
CoordinationUnitBase* CoordinationUnitBase::PassOwnershipToGraph(
std::unique_ptr<CoordinationUnitBase> new_cu) {
- return new_cu->graph()->AddNewCoordinationUnit(std::move(new_cu));
+ CoordinationUnitGraph* graph = new_cu->graph();
+ return graph->AddNewCoordinationUnit(std::move(new_cu));
}
} // namespace resource_coordinator

14
patches/pending_relocate/debian_buster/fixes/sizet.patch
View File

@@ -1,14 +0,0 @@
description: size_t is not in scope by default in gcc 6
author: Michael Gilbert <mgilbert@debian.org>
--- a/media/base/subsample_entry.h
+++ b/media/base/subsample_entry.h
@@ -36,7 +36,7 @@ struct SubsampleEntry {
// does not match |input_size|.
MEDIA_EXPORT bool VerifySubsamplesMatchSize(
const std::vector<SubsampleEntry>& subsamples,
- size_t input_size);
+ std::size_t input_size);
} // namespace media

2
patches/pending_relocate/debian_buster/fixes/widevine-locations.patch
View File

@@ -4,7 +4,7 @@ author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -373,6 +373,11 @@ bool PathProvider(int key, base::FilePat
@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
// TODO(crbug.com/663554): Remove this after component updated CDM is
// supported on Linux and ChromeOS.
case chrome::FILE_WIDEVINE_CDM:

4
patches/pending_relocate/debian_buster/gn/libcxx.patch
View File

@@ -3,11 +3,11 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/build/gen.py
+++ b/tools/gn/build/gen.py
@@ -312,7 +312,6 @@ def WriteGNNinja(path, platform, host, o
@@ -320,7 +320,6 @@ def WriteGNNinja(path, platform, host, o
if platform.is_linux():
ldflags.extend([
- '-static-libstdc++',
'-Wl,--as-needed',
])
libs.extend([
# This is needed by libc++.

16
patches/pending_relocate/debian_buster/system/event.patch
View File

@@ -4,8 +4,8 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/rtc_base/task_queue_libevent.cc
+++ b/third_party/webrtc/rtc_base/task_queue_libevent.cc
@@ -22,7 +22,7 @@
#include <type_traits> // for remove_reference<>::...
#include <utility> // for move
#include <type_traits>
#include <utility>
-#include "base/third_party/libevent/event.h"
+#include <event.h>
@@ -25,11 +25,11 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "build/build_config.h"
--- a/tools/gn/build/gen.py
+++ b/tools/gn/build/gen.py
@@ -320,6 +320,7 @@ def WriteGNNinja(path, platform, host, o
'-lpthread',
# Additional system libraries that are used.
'-lnspr4',
+ '-levent',
])
@@ -326,6 +326,7 @@ def WriteGNNinja(path, platform, host, o
libs.append('-ldl')
# Additional system libraries that are used.
libs.append('-lnspr4')
+ libs.append('-levent')
elif platform.is_darwin():
min_mac_version_flag = '-mmacosx-version-min=10.9'
cflags.append(min_mac_version_flag)

6
patches/pending_relocate/debian_buster/system/ffmpeg34.patch
View File

@@ -52,7 +52,7 @@ origin: chromium 66 authors
~FFmpegGlue();
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -28,6 +28,7 @@
@@ -23,6 +23,7 @@
#include "media/base/video_util.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/ffmpeg_decoding_loop.h"
@@ -60,7 +60,7 @@ origin: chromium 66 authors
namespace media {
@@ -111,6 +112,7 @@ static void ReleaseVideoBufferImpl(void*
@@ -80,6 +81,7 @@ static void ReleaseVideoBufferImpl(void*
// static
bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
@@ -68,7 +68,7 @@ origin: chromium 66 authors
return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr;
}
@@ -267,6 +269,8 @@ void FFmpegVideoDecoder::Initialize(
@@ -224,6 +226,8 @@ void FFmpegVideoDecoder::Initialize(
return;
}

43
patches/pending_relocate/debian_buster/system/harfbuzz.patch
View File

@@ -1,43 +0,0 @@
description: update api to support harfbuzz 2.1
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHor
static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
void* font_data,
unsigned count,
- hb_codepoint_t* first_glyph,
+ const hb_codepoint_t* first_glyph,
unsigned int glyph_stride,
hb_position_t* first_advance,
unsigned int advance_stride,
--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
@@ -39,13 +39,14 @@ void SkiaTextMetrics::GetGlyphWidthForHa
}
void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
- hb_codepoint_t* glyphs,
+ const hb_codepoint_t* first_glyph,
unsigned glyph_stride,
hb_position_t* advances,
unsigned advance_stride) {
// Batch the call to getTextWidths because its function entry cost is not
// cheap. getTextWidths accepts multiple glyphd ID, but not from a sparse
// array that copy them to a regular array.
+ hb_codepoint_t* glyphs = const_cast<hb_codepoint_t*>(first_glyph);
Vector<Glyph, 256> glyph_array(count);
for (unsigned i = 0; i < count;
i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
void GetGlyphWidthForHarfBuzz(unsigned count,
- hb_codepoint_t* first_glyph,
+ const hb_codepoint_t* first_glyph,
unsigned glyph_stride,
hb_position_t* first_advance,
unsigned advance_stride);

4
patches/pending_relocate/debian_buster/system/jpeg.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -670,7 +670,6 @@ group("gn_all") {
@@ -692,7 +692,6 @@ group("gn_all") {
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/leveldatabase:leveldb_test_targets",
@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"//third_party/opus:opus_compare",
"//third_party/opus:opus_demo",
"//third_party/opus:test_opus_api",
@@ -692,7 +691,6 @@ group("gn_all") {
@@ -714,7 +713,6 @@ group("gn_all") {
if (enable_nacl) {
deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ]
}

16
patches/pending_relocate/debian_buster/system/nspr.patch
View File

@@ -35,7 +35,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -841,8 +844,6 @@ jumbo_component("base") {
@@ -829,8 +832,6 @@ jumbo_component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
@@ -43,15 +43,15 @@ author: Michael Gilbert <mgilbert@debian.org>
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"thread_annotations.h",
"threading/platform_thread.h",
"threading/platform_thread.cc",
--- a/tools/gn/build/gen.py
+++ b/tools/gn/build/gen.py
@@ -318,6 +318,8 @@ def WriteGNNinja(path, platform, host, o
# These are needed by libc++.
'-ldl',
'-lpthread',
+ # Additional system libraries that are used.
+ '-lnspr4',
@@ -324,6 +324,8 @@ def WriteGNNinja(path, platform, host, o
])
# This is needed by libc++.
libs.append('-ldl')
+ # Additional system libraries that are used.
+ libs.append('-lnspr4')
elif platform.is_darwin():
min_mac_version_flag = '-mmacosx-version-min=10.9'
cflags.append(min_mac_version_flag)

18
patches/pending_relocate/debian_buster/system/openjpeg.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/pdfium/third_party/BUILD.gn
+++ b/third_party/pdfium/third_party/BUILD.gn
@@ -367,39 +367,11 @@ config("fx_libopenjpeg_warnings") {
@@ -394,39 +394,11 @@ config("fx_libopenjpeg_warnings") {
}
}
@@ -61,24 +61,24 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp
+++ b/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp
@@ -17,8 +17,6 @@
#include "core/fxcrt/fx_memory.h"
@@ -18,8 +18,6 @@
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
-#include "third_party/libopenjpeg20/opj_malloc.h"
namespace {
@@ -515,7 +513,6 @@ bool CJPX_Decoder::Init(pdfium::span<con
@@ -513,7 +511,6 @@ bool CJPX_Decoder::Init(pdfium::span<con
return false;
m_Image = pTempImage;
- m_Image->pdfium_use_colorspace = !!m_ColorSpace;
return true;
}
if (!m_Parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0,
@@ -549,7 +546,7 @@ bool CJPX_Decoder::Init(pdfium::span<con
@@ -550,7 +547,7 @@ bool CJPX_Decoder::StartDecode() {
// TODO(palmer): Using |opj_free| here resolves the crash described in
// https://crbug.com/737033, but ultimately we need to harmonize the
// memory allocation strategy across OpenJPEG and its PDFium callers.
@@ -100,7 +100,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/pdfium/BUILD.gn
+++ b/third_party/pdfium/BUILD.gn
@@ -21,7 +21,6 @@ config("pdfium_common_config") {
@@ -20,7 +20,6 @@ config("pdfium_common_config") {
ldflags = []
include_dirs = [ "." ]
defines = [
@@ -108,7 +108,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
@@ -78,7 +77,6 @@ config("pdfium_core_config") {
@@ -77,7 +76,6 @@ config("pdfium_core_config") {
if (is_linux) {
if (current_cpu == "x64") {
defines += [ "_FX_CPU_=_FX_X64_" ]

60
patches/pending_relocate/debian_buster/system/vpx.patch
View File

@@ -16,7 +16,7 @@ author: Michael Gilbert <mgilbert@debian.org>
namespace media {
--- a/third_party/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
@@ -15,10 +15,10 @@
@@ -17,10 +17,10 @@
#include <limits>
#include <vector>
@@ -31,7 +31,14 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "absl/memory/memory.h"
#include "api/video/color_space.h"
@@ -609,34 +609,6 @@ int VP9EncoderImpl::InitAndSetControlSet
@@ -631,42 +631,12 @@ int VP9EncoderImpl::InitAndSetControlSet
inst->VP9().adaptiveQpMode ? 3 : 0);
vpx_codec_control(encoder_, VP9E_SET_FRAME_PARALLEL_DECODING, 0);
- vpx_codec_control(encoder_, VP9E_SET_SVC_GF_TEMPORAL_REF, 0);
if (is_svc_) {
vpx_codec_control(encoder_, VP9E_SET_SVC, 1);
vpx_codec_control(encoder_, VP9E_SET_SVC_PARAMETERS, &svc_params_);
}
@@ -55,7 +62,8 @@ author: Michael Gilbert <mgilbert@debian.org>
- // quality flickering and is not compatible with RTP non-flexible mode.
- vpx_svc_frame_drop_t svc_drop_frame;
- memset(&svc_drop_frame, 0, sizeof(svc_drop_frame));
- svc_drop_frame.framedrop_mode = FULL_SUPERFRAME_DROP;
- svc_drop_frame.framedrop_mode =
- full_superframe_drop_ ? FULL_SUPERFRAME_DROP : CONSTRAINED_LAYER_DROP;
- svc_drop_frame.max_consec_drop = std::numeric_limits<int>::max();
- for (size_t i = 0; i < num_spatial_layers_; ++i) {
- svc_drop_frame.framedrop_thresh[i] = config_->rc_dropframe_thresh;
@@ -66,19 +74,39 @@ author: Michael Gilbert <mgilbert@debian.org>
// Register callback for getting each spatial layer.
vpx_codec_priv_output_cx_pkt_cb_pair_t cbp = {
VP9EncoderImpl::EncoderOutputCodedPacketCallback,
@@ -786,11 +758,6 @@ int VP9EncoderImpl::Encode(const VideoFr
@@ -762,10 +732,6 @@ int VP9EncoderImpl::Encode(const VideoFr
}
}
- for (int sl_idx = 0; sl_idx < num_active_spatial_layers_; ++sl_idx) {
- layer_id.temporal_layer_id_per_spatial[sl_idx] = layer_id.temporal_layer_id;
- }
-
vpx_codec_control(encoder_, VP9E_SET_SVC_LAYER_ID, &layer_id);
if (requested_bitrate_allocation_) {
@@ -854,20 +820,6 @@ int VP9EncoderImpl::Encode(const VideoFr
flags = VPX_EFLAG_FORCE_KF;
}
- if (external_ref_control_) {
- vpx_svc_ref_frame_config_t ref_config = SetReferences(force_key_frame_);
- vpx_svc_ref_frame_config_t ref_config =
- SetReferences(force_key_frame_, layer_id.spatial_layer_id);
-
- if (VideoCodecMode::kScreensharing == codec_.mode) {
- for (uint8_t sl_idx = 0; sl_idx < num_active_spatial_layers_; ++sl_idx) {
- ref_config.duration[sl_idx] = static_cast<int64_t>(
- 90000 / framerate_controller_[sl_idx].GetTargetRate());
- }
- }
-
- vpx_codec_control(encoder_, VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_config);
- }
-
first_frame_in_picture_ = true;
// TODO(ssilkin): Frame duration should be specified per spatial layer
// since their frame rate can be different. For now calculate frame duration
// based on target frame rate of the highest spatial layer, which frame rate
@@ -894,10 +861,8 @@ void VP9EncoderImpl::PopulateCodecSpecif
@@ -980,10 +932,8 @@ void VP9EncoderImpl::PopulateCodecSpecif
vp9_info->num_spatial_layers = num_active_spatial_layers_;
vp9_info->num_ref_pics = 0;
@@ -87,18 +115,18 @@ author: Michael Gilbert <mgilbert@debian.org>
vp9_info->gof_idx = kNoGofIdx;
- FillReferenceIndices(pkt, pics_since_key_, vp9_info->inter_layer_predicted,
- vp9_info);
// TODO(webrtc:9794): Add fake reference to empty reference list to
// workaround the frame buffer issue on receiver.
} else {
@@ -925,6 +890,7 @@ void VP9EncoderImpl::PopulateCodecSpecif
}
vp9_info->gof_idx =
static_cast<uint8_t>(pics_since_key_ % gof_.num_frames_in_gof);
@@ -1011,6 +961,7 @@ void VP9EncoderImpl::PopulateCodecSpecif
first_frame_in_picture_ = false;
}
+/*
void VP9EncoderImpl::FillReferenceIndices(const vpx_codec_cx_pkt& pkt,
const size_t pic_num,
const bool inter_layer_predicted,
@@ -1137,6 +1103,7 @@ vpx_svc_ref_frame_config_t VP9EncoderImp
@@ -1243,6 +1194,7 @@ vpx_svc_ref_frame_config_t VP9EncoderImp
return ref_config;
}
@@ -106,8 +134,8 @@ author: Michael Gilbert <mgilbert@debian.org>
int VP9EncoderImpl::GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt) {
RTC_DCHECK_EQ(pkt->kind, VPX_CODEC_CX_FRAME_PKT);
@@ -1183,10 +1150,6 @@ int VP9EncoderImpl::GetEncodedLayerFrame
input_image_->timestamp(), first_frame_in_picture);
@@ -1288,10 +1240,6 @@ int VP9EncoderImpl::GetEncodedLayerFrame
input_image_->timestamp());
encoded_image_.SetSpatialIndex(spatial_index);
- if (is_flexible_mode_) {
@@ -117,7 +145,7 @@ author: Michael Gilbert <mgilbert@debian.org>
TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_._length);
encoded_image_.SetTimestamp(input_image_->timestamp());
encoded_image_.capture_time_ms_ = input_image_->render_time_ms();
@@ -1194,10 +1157,8 @@ int VP9EncoderImpl::GetEncodedLayerFrame
@@ -1299,10 +1247,8 @@ int VP9EncoderImpl::GetEncodedLayerFrame
encoded_image_.content_type_ = (codec_.mode == VideoCodecMode::kScreensharing)
? VideoContentType::SCREENSHARE
: VideoContentType::UNSPECIFIED;

2
patches/pending_relocate/debian_buster/system/zlib.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/courgette/BUILD.gn
+++ b/courgette/BUILD.gn
@@ -59,7 +59,6 @@ static_library("courgette_lib") {
@@ -60,7 +60,6 @@ static_library("courgette_lib") {
deps = [
"//base",

20
patches/pending_relocate/debian_buster/warnings/enum-compare.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc
+++ b/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc
@@ -52,11 +52,11 @@ class PasswordGenerationPopupViewViews::
@@ -51,11 +51,11 @@ class PasswordGenerationPopupViewViews::
BuildColumnSet(layout);
layout->StartRow(views::GridLayout::kFixedSize, 0);
@@ -19,24 +19,6 @@ author: Michael Gilbert <mgilbert@debian.org>
DCHECK(!password_label_);
password_label_ = autofill::CreateLabelWithColorReadabilityDisabled(
--- a/ui/aura/hit_test_data_provider_aura.cc
+++ b/ui/aura/hit_test_data_provider_aura.cc
@@ -50,11 +50,10 @@ base::Optional<viz::HitTestRegionList> H
return base::nullopt;
base::Optional<viz::HitTestRegionList> hit_test_region_list(base::in_place);
- hit_test_region_list->flags =
- event_targeting_policy ==
- ws::mojom::EventTargetingPolicy::DESCENDANTS_ONLY
- ? viz::HitTestRegionFlags::kHitTestIgnore
- : viz::HitTestRegionFlags::kHitTestMine;
+ hit_test_region_list->flags = viz::HitTestRegionFlags::kHitTestMine;
+ if (event_targeting_policy ==
+ ws::mojom::EventTargetingPolicy::DESCENDANTS_ONLY)
+ hit_test_region_list->flags = viz::HitTestRegionFlags::kHitTestIgnore;
// TODO(crbug.com/805416): Use pixels instead of DIP units for bounds.
hit_test_region_list->bounds = window_->bounds();
--- a/components/viz/common/gl_helper.cc
+++ b/components/viz/common/gl_helper.cc
@@ -476,7 +476,7 @@ void GLHelper::CopyTextureToImpl::Cancel

4
patches/pending_relocate/debian_stretch/system/icu.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/graphics/logging_canvas.cc
+++ b/third_party/blink/renderer/platform/graphics/logging_canvas.cc
@@ -530,8 +530,12 @@ String StringForUTF32LEText(const void*
@@ -513,8 +513,12 @@ String StringForUTF32LEText(const void*
utf16 = icu::UnicodeString::fromUTF32(reinterpret_cast<const UChar32*>(text),
static_cast<int32_t>(byte_length));
#endif
@@ -18,7 +18,7 @@ author: Michael Gilbert <mgilbert@debian.org>
String StringForText(const void* text,
--- a/components/url_formatter/idn_spoof_checker.cc
+++ b/components/url_formatter/idn_spoof_checker.cc
@@ -396,8 +396,8 @@ Skeletons IDNSpoofChecker::GetSkeletons(
@@ -415,8 +415,8 @@ Skeletons IDNSpoofChecker::GetSkeletons(
if ((u04cf_pos = host.indexOf(0x4CF)) != -1) {
icu::UnicodeString host_alt(host);
size_t length = host_alt.length();

70
patches/pending_relocate/inox-patchset/chromium-skia-harmony.patch
View File

@@ -1,77 +1,13 @@
--- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp
+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
@@ -121,8 +121,6 @@ public:
@@ -121,8 +121,8 @@ public:
: fGetVarDesignCoordinates(nullptr)
, fGetVarAxisFlags(nullptr)
, fLibrary(nullptr)
- , fIsLCDSupported(false)
- , fLCDExtra(0)
+ , fIsLCDSupported(true)
+ , fLCDExtra(2)
{
if (FT_New_Library(&gFTMemory, &fLibrary)) {
return;
@@ -182,12 +180,7 @@ public:
}
#endif
- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
- // The default has changed over time, so this doesn't mean the same thing to all users.
- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
- fIsLCDSupported = true;
- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
- }
+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
}
~FreeTypeLibrary() {
if (fLibrary) {
@@ -196,8 +189,6 @@ public:
}
FT_Library library() { return fLibrary; }
- bool isLCDSupported() { return fIsLCDSupported; }
- int lcdExtra() { return fLCDExtra; }
// FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
// Prior to this there was no way to get the coordinates out of the FT_Face.
@@ -214,8 +205,6 @@ public:
private:
FT_Library fLibrary;
- bool fIsLCDSupported;
- int fLCDExtra;
// FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
// The following platforms provide FreeType of at least 2.4.0.
@@ -713,17 +702,6 @@ void SkTypeface_FreeType::onFilterRec(Sk
rec->fTextSize = SkIntToScalar(1 << 14);
}
- if (isLCD(*rec)) {
- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
- SkAutoMutexAcquire ama(gFTMutex);
- ref_ft_library();
- if (!gFTLibrary->isLCDSupported()) {
- // If the runtime Freetype library doesn't support LCD, disable it here.
- rec->fMaskFormat = SkMask::kA8_Format;
- }
- unref_ft_library();
- }
-
SkPaint::Hinting h = rec->getHinting();
if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
// collapse full->normal hinting if we're not doing LCD
@@ -1137,11 +1115,11 @@ bool SkScalerContext_FreeType::getCBoxFo
void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
if (glyph->fMaskFormat == SkMask::kLCD16_Format) {
if (fLCDIsVert) {
- glyph->fHeight += gFTLibrary->lcdExtra();
- glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
+ glyph->fHeight += 2;
+ glyph->fTop -= 1;
} else {
- glyph->fWidth += gFTLibrary->lcdExtra();
- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
+ glyph->fWidth += 2;
+ glyph->fLeft -= 1;
}
}
}

554
patches/pending_relocate/inox-patchset/chromium-vaapi-r18.patch
View File

@@ -1,554 +0,0 @@
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
This patch contains all the changes necessary to use VA-API along with
vaapi-driver to run all media use cases supported with hardware acceleration.
It is intended to remain as experimental accessible from chrome://flags on linux.
It requires libva/intel-vaapi-driver to be installed on the system path where
chrome is executed. Other drivers could be tested if available. Flags are
kept independent for linux, where this feature has to be enabled before
actually using it. This should not change how other OSes use the flags
already, the new flags will show at the buttom on the section of unavailable
experiments
The changes cover a range of compiler pre-processor flags to enable the stack.
It moves the presandbox operations to the vaapi_wrapper class as the hook function
is available there. vaInit will open driver on the correct installed folder.
chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated
video are used. The other flags are kept for ChromeOS and other OSes.
Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
BUG=NONE
TEST=subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder
and decoder hardware accelerated
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;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
@@ -1460,12 +1460,14 @@ const FeatureEntry kFeatureEntries[] = {
{"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
flag_descriptions::kUiPartialSwapDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
{"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
{"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
+#endif
{"enable-webrtc-hw-h264-encoding",
flag_descriptions::kWebrtcHwH264EncodingName,
flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
@@ -1850,6 +1852,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSingleProcessMashDescription, kOsCrOS,
FEATURE_VALUE_TYPE(features::kSingleProcessMash)},
#endif // OS_CHROMEOS
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ {
+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
+ },
+#else
{
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -1857,6 +1866,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
+#endif
#if defined(OS_WIN)
{"enable-hdr", flag_descriptions::kEnableHDRName,
flag_descriptions::kEnableHDRDescription, kOsWin,
@@ -2513,12 +2523,17 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
#endif // ENABLE_ISOLATED_XR_SERVICE
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ {"enable-accelerated-mjpeg-decode",
+ flag_descriptions::kAcceleratedMjpegDecodeName,
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
+#elif defined(OS_CHROMEOS)
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
-#endif // OS_CHROMEOS
+#endif
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -19,6 +19,7 @@
#include "base/sys_info.h"
#include "base/timer/timer.h"
#include "base/values.h"
+#include "build/build_config.h"
#include "cc/base/switches.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
@@ -84,9 +85,14 @@ void DeriveCommandLine(const GURL& start
::switches::kDisable2dCanvasImageChromium,
::switches::kDisableAccelerated2dCanvas,
::switches::kDisableAcceleratedJpegDecoding,
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ ::switches::kEnableAcceleratedMjpegDecode,
+ ::switches::kEnableAcceleratedVideo,
+#else
::switches::kDisableAcceleratedMjpegDecode,
::switches::kDisableAcceleratedVideoDecode,
::switches::kDisableAcceleratedVideoEncode,
+#endif
::switches::kDisableBlinkFeatures,
::switches::kDisableCastStreamingHWEncoding,
::switches::kDisableGpu,
@@ -160,8 +166,10 @@ void DeriveCommandLine(const GURL& start
::switches::kEnableWebGLImageChromium,
::switches::kEnableWebVR,
::switches::kEnableUnsafeWebGPU,
+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
::switches::kDisableWebRtcHWDecoding,
::switches::kDisableWebRtcHWEncoding,
+#endif
::switches::kOzonePlatform,
ash::switches::kAshEnableTabletMode,
ash::switches::kAshEnableWaylandServer,
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -14,6 +14,13 @@ const char kAccelerated2dCanvasDescripti
"Enables the use of the GPU to perform 2d canvas rendering instead of "
"using software rendering.";
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
+const char kAcceleratedVideoDescription[] =
+ "Hardware-accelerated video where VA-API driver is installed on the"
+ "system.";
+#endif
+
const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
const char kAcceleratedVideoDecodeDescription[] =
"Hardware-accelerated video decode where available.";
@@ -2069,6 +2076,7 @@ const char kWebrtcHybridAgcName[] = "Web
const char kWebrtcHybridAgcDescription[] =
"WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
const char kWebrtcHwDecodingDescription[] =
"Support in WebRTC for decoding video streams using platform hardware.";
@@ -2076,6 +2084,7 @@ const char kWebrtcHwDecodingDescription[
const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
const char kWebrtcHwEncodingDescription[] =
"Support in WebRTC for encoding video streams using platform hardware.";
+#endif
const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
const char kWebrtcHwH264EncodingDescription[] =
@@ -3002,14 +3011,16 @@ const char kTextSuggestionsTouchBarDescr
// Chrome OS -------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
const char kAcceleratedMjpegDecodeDescription[] =
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
+#endif
+#if defined(OS_CHROMEOS)
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -37,6 +37,10 @@ namespace flag_descriptions {
extern const char kAccelerated2dCanvasName[];
extern const char kAccelerated2dCanvasDescription[];
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+extern const char kAcceleratedVideoName[];
+extern const char kAcceleratedVideoDescription[];
+#endif
extern const char kAcceleratedVideoDecodeName[];
extern const char kAcceleratedVideoDecodeDescription[];
@@ -1827,13 +1831,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
+#endif
+
+// Chrome OS ------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
+
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -150,7 +150,11 @@ const GpuFeatureData GetGpuFeatureData(
{"video_decode",
SafeGetFeatureStatus(gpu_feature_info,
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
+#else
command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
+#endif
"Accelerated video decode has been disabled, either via blacklist, "
"about:flags or the command line.",
true, true},
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -211,7 +211,9 @@ static const char* const kSwitchNames[]
switches::kDisableLogging,
switches::kDisableShaderNameHashing,
switches::kDisableSkiaRuntimeOpts,
+#if !defined(OS_LINUX)
switches::kDisableWebRtcHWEncoding,
+#endif
#if defined(OS_WIN)
switches::kEnableAcceleratedVpxDecode,
#endif
--- a/content/browser/renderer_host/media/video_capture_browsertest.cc
+++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -166,8 +166,13 @@ class VideoCaptureBrowserTest : public C
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeJpegDecodeAccelerator);
} else {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnableAcceleratedMjpegDecode);
+#else
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableAcceleratedMjpegDecode);
+#endif
}
}
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2996,7 +2996,11 @@ void RenderProcessHostImpl::PropagateBro
switches::kDefaultTileHeight,
switches::kDisable2dCanvasImageChromium,
switches::kDisableAcceleratedJpegDecoding,
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ switches::kEnableAcceleratedVideo,
+#else
switches::kDisableAcceleratedVideoDecode,
+#endif
switches::kDisableBackgroundTasks,
switches::kDisableBackgroundTimerThrottling,
switches::kDisableBreakpad,
@@ -3136,8 +3140,10 @@ void RenderProcessHostImpl::PropagateBro
#if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
switches::kDisableMojoRenderer,
#endif
+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
switches::kDisableWebRtcHWDecoding,
switches::kDisableWebRtcHWEncoding,
+#endif
switches::kEnableWebRtcSrtpAesGcm,
switches::kEnableWebRtcSrtpEncryptedHeaders,
switches::kEnableWebRtcStunOrigin,
--- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
+++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
@@ -66,7 +66,12 @@ class MAYBE_WebRtcMediaRecorderTest
return;
// This flag is also used for encoding, https://crbug.com/616640.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedVideoDecode);
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ switches::kEnableAcceleratedVideo
+#else
+ switches::kDisableAcceleratedVideoDecode
+#endif
+ );
}
private:
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
+ if (is_desktop_linux) {
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& pa
base::PlatformThread::SetName("CrGpuMain");
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& pa
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
--- a/content/public/browser/gpu_utils.cc
+++ b/content/public/browser/gpu_utils.cc
@@ -72,9 +72,17 @@ const gpu::GpuPreferences GetGpuPreferen
gpu_preferences.in_process_gpu =
command_line->HasSwitch(switches::kInProcessGPU);
gpu_preferences.disable_accelerated_video_decode =
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
+#else
command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
+#endif
gpu_preferences.disable_accelerated_video_encode =
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
+#else
command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
+#endif
#if defined(OS_WIN)
uint32_t enable_accelerated_vpx_decode_val =
gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -69,6 +69,11 @@ const char kDisable3DAPIs[]
// Disable gpu-accelerated 2d canvas.
const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
+#if defined(OS_LINUX)
+// Enables hardware acceleration of video for Linux only. VA-API driver
+// is required to be present on the system installation.
+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
+#endif
// Disables hardware acceleration of video decode, where available.
const char kDisableAcceleratedVideoDecode[] =
"disable-accelerated-video-decode";
@@ -852,11 +857,13 @@ const char kWaitForDebuggerChildren[]
// ignores this switch on its stable and beta channels.
const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
+#if defined(OS_CHROMEOS)
// Disables HW decode acceleration for WebRTC.
const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding";
// Disables HW encode acceleration for WebRTC.
const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
+#endif
// Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
// See https://tools.ietf.org/html/rfc7714 for further information.
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -103,6 +103,9 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDomAutomationController[];
extern const char kDisable2dCanvasClipAntialiasing[];
CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
+#endif
CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
CONTENT_EXPORT extern const char kEnableAutomation[];
@@ -239,8 +242,10 @@ CONTENT_EXPORT extern const char kValida
CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
+#if defined(OS_CHROMEOS)
CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
+#endif
CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -295,10 +295,18 @@ void PeerConnectionDependencyFactory::In
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
+#else
if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
+#endif
decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
+#else
if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
+#endif
encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
}
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1325,7 +1325,11 @@ media::GpuVideoAcceleratorFactories* Ren
kGpuStreamPriorityMedia);
const bool enable_video_accelerator =
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
+#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
+#endif
(gpu_channel_host->gpu_feature_info()
.status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
gpu::kGpuFeatureStatusEnabled);
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
@@ -370,17 +370,6 @@
]
},
{
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247],
- "os": {
- "type": "linux"
- },
- "features": [
- "accelerated_video_decode"
- ]
- },
- {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
@@ -508,6 +508,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
}
}
+if (is_desktop_linux && use_vaapi) {
+ import("//build/config/linux/pkg_config.gni")
+
+ pkg_config("libva_config") {
+ packages = [ "libva" ]
+ }
+}
+
if (use_vaapi) {
test("jpeg_encode_accelerator_unittest") {
deps = [
@@ -578,6 +586,10 @@ if (is_chromeos || is_linux) {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
+
+ if (is_desktop_linux) {
+ public_configs = [ ":libva_config" ]
+ }
}
}
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -108,10 +108,15 @@ const char kUseFileForFakeAudioCapture[]
// accelerator hardware to be present.
const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator";
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+// Enable hardware accelerated mjpeg decode on linux
+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
+#else
// Disable hardware acceleration of mjpeg decode for captured frame, where
// available.
const char kDisableAcceleratedMjpegDecode[] =
"disable-accelerated-mjpeg-decode";
+#endif
// When running tests on a system without the required hardware or libraries,
// this flag will cause the tests to fail. Otherwise, they silently succeed.
@@ -487,15 +492,22 @@ const base::Feature kPreloadMediaEngagem
#endif
bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
+
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableAcceleratedMjpegDecode)
+#else
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableAcceleratedMjpegDecode)) {
+ switches::kDisableAcceleratedMjpegDecode)
+#endif
+ ) {
return false;
}
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
+#if !defined(OS_ANDROID) && defined(OS_LINUX)
return true;
#endif
return false;
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -64,7 +64,11 @@ MEDIA_EXPORT extern const char kUseFakeD
MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[];
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
+#else
MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
+#endif
MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
MEDIA_EXPORT extern const char kMuteAudio[];
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -356,7 +356,11 @@ bool UtilityProcessHost::StartProcess()
switches::kOverrideUseSoftwareGLForTests,
switches::kOverrideEnabledCdmInterfaceVersion,
switches::kProxyServer,
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ switches::kEnableAcceleratedMjpegDecode,
+#else
switches::kDisableAcceleratedMjpegDecode,
+#endif
switches::kUseFakeDeviceForMediaStream,
switches::kUseFakeJpegDecodeAccelerator,
switches::kUseFileForFakeVideoCapture,

12
patches/pending_relocate/inox-patchset/clang-compiler-flags.patch
View File

@@ -1,12 +0,0 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1502,9 +1502,6 @@ config("default_warnings") {
# Ignore warnings about MSVC optimization pragmas.
# TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
"-Wno-ignored-pragma-optimize",
-
- # TODO(hans): https://crbug.com/890307
- "-Wno-defaulted-function-deleted",
]
}
}

2
patches/pending_relocate/inox-patchset/fix-cfi-failures-with-unbundled-libxml.patch
View File

@@ -101,7 +101,7 @@
+ free(base);
ResourceLoaderOptions fetch_options;
fetch_options.initiator_info.name = FetchInitiatorTypeNames::xml;
fetch_options.initiator_info.name = fetch_initiator_type_names::kXml;
--- a/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
+++ b/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
@@ -273,18 +273,18 @@ void XsltUnicodeSortFunction(xsltTransfo

2
patches/pending_relocate/ungoogled-chromium/linux/fix-libva1-compatibility.patch
View File

@@ -3,7 +3,7 @@
--- a/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
@@ -38,6 +38,10 @@ enum VAJDADecoderFailure {
@@ -36,6 +36,10 @@ enum VAJDADecoderFailure {
VAJDA_DECODER_FAILURES_MAX,
};

2
patches/pending_relocate/ungoogled-chromium/linux/fix-nullptr-t-namespace.patch
View File

@@ -2,7 +2,7 @@
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -625,7 +625,7 @@ bool operator>(const T& a, const EvalJsR
@@ -631,7 +631,7 @@ bool operator>(const T& a, const EvalJsR
return b.error.empty() && (JsLiteralHelper<T>::Convert(a) > b.value);
}

2
patches/pending_relocate/ungoogled-chromium/macos/disable-symbol-order-verification.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1299,7 +1299,7 @@ if (is_win) {
@@ -1282,7 +1282,7 @@ if (is_win) {
assert(_framework_binary_path != "",
"Ignore configuration-dependent unused variable warning")

2
patches/pending_relocate/ungoogled-chromium/macos/fix-disk_image_type_sniffer_mac.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/common/safe_browsing/BUILD.gn
+++ b/chrome/common/safe_browsing/BUILD.gn
@@ -73,11 +73,11 @@ source_set("safe_browsing") {
@@ -87,11 +87,11 @@ source_set("safe_browsing") {
":file_type_policies",
]

19
patches/pending_relocate/ungoogled-chromium/macos/fix-gn-safe_browsing.patch
View File

@@ -1,19 +1,8 @@
# Fix GN safe_browsing on macOS
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1497,7 +1497,7 @@ config("default_warnings") {
# recognize.
cflags += [
# TODO(thakis): https://crbug.com/753973
- "-Wno-enum-compare-switch",
+ # "-Wno-enum-compare-switch",
# Ignore warnings about MSVC optimization pragmas.
# TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1729,7 +1729,6 @@ jumbo_split_static_library("browser") {
@@ -1734,7 +1734,6 @@ jumbo_split_static_library("browser") {
"//chrome/browser/profiling_host",
"//chrome/browser/push_messaging:budget_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
@@ -23,7 +12,7 @@
"//chrome/browser/ui/webui/bluetooth_internals",
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -776,7 +776,6 @@ jumbo_static_library("extensions") {
@@ -775,7 +775,6 @@ jumbo_static_library("extensions") {
"//chrome/browser/media/router",
"//chrome/browser/media/router/discovery",
"//chrome/browser/resource_coordinator:mojo_bindings",
@@ -33,14 +22,14 @@
"//chrome/common",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -381,7 +381,6 @@ jumbo_split_static_library("ui") {
@@ -384,7 +384,6 @@ jumbo_split_static_library("ui") {
"//chrome/browser/engagement:mojo_bindings",
"//chrome/browser/media:mojo_bindings",
"//chrome/browser/profiling_host",
- "//chrome/browser/safe_browsing",
"//chrome/browser/ssl:proto",
"//chrome/browser/ui/webui/app_management:mojo_bindings",
"//chrome/browser/ui/webui/bluetooth_internals",
"//chrome/browser/ui/webui/interventions_internals:mojo_bindings",
--- a/chrome/browser/ui/webui/settings/change_password_handler.cc
+++ b/chrome/browser/ui/webui/settings/change_password_handler.cc
@@ -52,19 +52,19 @@ void ChangePasswordHandler::HandleInitia

Some files were not shown because too many files have changed in this diff Show More