diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dfe5795..7d97fd84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 64.0.3282.193 +* updated AdBlock filters + # 64.0.3282.182 * add support for domain-based adblock filters * optimized memory allocation for filters diff --git a/patches/BRM010_modify-default-preferences.patch b/patches/BRM010_modify-default-preferences.patch index 15f6bdee..ee2cf3aa 100644 --- a/patches/BRM010_modify-default-preferences.patch +++ b/patches/BRM010_modify-default-preferences.patch @@ -18,7 +18,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -879,7 +879,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -882,7 +882,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -30,15 +30,15 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc -@@ -625,7 +625,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -644,7 +644,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { std::string()); registry->RegisterBooleanPref(prefs::kEnableReferrers, true); data_reduction_proxy::RegisterPrefs(registry); - registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); + registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false); + registry->RegisterListPref(prefs::kDnsOverHttpsServers); + registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods); registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); - registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true); - #if defined(OS_POSIX) diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc --- a/chrome/browser/net/prediction_options.cc +++ b/chrome/browser/net/prediction_options.cc @@ -99,8 +99,8 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi + registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true); + registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false); registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false); + registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0); } - diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc diff --git a/patches/BRM021_revert-remove-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile.patch b/patches/BRM021_revert-remove-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile.patch index 488cb79e..0e1ab925 100644 --- a/patches/BRM021_revert-remove-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile.patch +++ b/patches/BRM021_revert-remove-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile.patch @@ -100,7 +100,7 @@ diff --git a/third_party/WebKit/Source/platform/runtime_enabled_features.json5 b { name: "DeprecationReporting", status: "experimental", -@@ -974,6 +979,11 @@ +@@ -980,6 +985,11 @@ name: "ShadowPiercingDescendantCombinator", status: "experimental", }, diff --git a/patches/BRM022_revert-disable-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile-for-m63.patch b/patches/BRM022_revert-disable-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile-for-m63.patch index c6eb2611..2d1d1615 100644 --- a/patches/BRM022_revert-disable-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile-for-m63.patch +++ b/patches/BRM022_revert-disable-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile-for-m63.patch @@ -55,7 +55,7 @@ diff --git a/third_party/WebKit/Source/platform/runtime_enabled_features.json5 b }, { name: "DeprecationReporting", -@@ -979,10 +980,11 @@ +@@ -985,10 +986,11 @@ name: "ShadowPiercingDescendantCombinator", status: "experimental", }, diff --git a/patches/BRM025_do-not-track-google-search-results-clicks.patch b/patches/BRM025_do-not-track-google-search-results-clicks.patch index 572b348e..7dbc7f71 100644 --- a/patches/BRM025_do-not-track-google-search-results-clicks.patch +++ b/patches/BRM025_do-not-track-google-search-results-clicks.patch @@ -27,7 +27,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi #include "platform/CrossThreadFunctional.h" #include "platform/DateComponents.h" #include "platform/EventDispatchForbiddenScope.h" -@@ -5786,8 +5787,24 @@ void Document::FinishedParsing() { +@@ -5789,8 +5790,24 @@ void Document::FinishedParsing() { fetcher_->ClearResourcesFromPreviousFetcher(); } diff --git a/patches/BRM029_ungoogled-chromium-disable-webrtc-log-uploader.patch b/patches/BRM029_ungoogled-chromium-disable-webrtc-log-uploader.patch index 695fe5c5..8184cfbb 100644 --- a/patches/BRM029_ungoogled-chromium-disable-webrtc-log-uploader.patch +++ b/patches/BRM029_ungoogled-chromium-disable-webrtc-log-uploader.patch @@ -39,38 +39,17 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser } void WebRtcLogUploader::PrepareMultipartPostData( -@@ -149,29 +129,7 @@ void WebRtcLogUploader::PrepareMultipartPostData( +@@ -149,6 +129,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); -- std::unique_ptr post_data(new std::string()); -- SetupMultipart(post_data.get(), -- compressed_log, -- upload_done_data.incoming_rtp_dump, -- upload_done_data.outgoing_rtp_dump, -- *meta_data.get()); -- -- // If a test has set the test string pointer, write to it and skip uploading. -- // Still fire the upload callback so that we can run an extension API test -- // using the test framework for that without hanging. -- // TODO(grunell): Remove this when the api test for this feature is fully -- // implemented according to the test plan. http://crbug.com/257329. -- if (post_data_) { -- *post_data_ = *post_data; -- NotifyUploadDone(net::HTTP_OK, "", upload_done_data); -- return; -- } -- -- BrowserThread::PostTask( -- BrowserThread::IO, FROM_HERE, -- base::BindOnce(&WebRtcLogUploader::UploadCompressedLog, -- base::Unretained(this), upload_done_data, -- base::Passed(&post_data))); + NotifyUploadDone(net::HTTP_OK, "", upload_done_data); - } - - void WebRtcLogUploader::UploadStoredLog( -@@ -237,44 +195,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore( ++ return; ++ + std::unique_ptr post_data(new std::string()); + SetupMultipart(post_data.get(), + compressed_log, +@@ -237,44 +220,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore( webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.log_path); diff --git a/patches/BRM037_ungoogled-chromium-clear-http-cache-menu-item.patch b/patches/BRM037_ungoogled-chromium-clear-http-cache-menu-item.patch index 30f341a2..9cbf2fcd 100644 --- a/patches/BRM037_ungoogled-chromium-clear-http-cache-menu-item.patch +++ b/patches/BRM037_ungoogled-chromium-clear-http-cache-menu-item.patch @@ -7,7 +7,7 @@ Date: Mon Feb 12 21:45:21 2018 +0100 diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h -@@ -148,6 +148,7 @@ +@@ -150,6 +150,7 @@ #define IDC_DEV_TOOLS_INSPECT 40023 #define IDC_UPGRADE_DIALOG 40024 #define IDC_VIEW_INCOMPATIBILITIES 40025 @@ -18,7 +18,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -1067,6 +1067,9 @@ are declared in build/common.gypi. +@@ -1062,6 +1062,9 @@ are declared in build/common.gypi. &Clear browsing data... @@ -28,7 +28,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &Downloads -@@ -1105,6 +1108,9 @@ are declared in build/common.gypi. +@@ -1100,6 +1103,9 @@ are declared in build/common.gypi. &Clear Browsing Data... @@ -41,7 +41,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -58,6 +58,9 @@ +@@ -59,6 +59,9 @@ #include "extensions/browser/extension_system.h" #include "printing/features/features.h" #include "ui/events/keycodes/keyboard_codes.h" @@ -51,7 +51,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui #if defined(OS_MACOSX) #include "chrome/browser/ui/browser_commands_mac.h" -@@ -625,6 +628,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( +@@ -624,6 +627,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( case IDC_CLEAR_BROWSING_DATA: ShowClearBrowsingDataDialog(browser_); break; @@ -61,7 +61,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui case IDC_IMPORT_SETTINGS: ShowImportDialog(browser_); break; -@@ -867,6 +873,7 @@ void BrowserCommandController::InitCommandState() { +@@ -865,6 +871,7 @@ void BrowserCommandController::InitCommandState() { !profile()->IsOffTheRecord()); command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, !guest_session); @@ -145,7 +145,7 @@ diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -46546,6 +46546,7 @@ Called by update_traffic_annotation_histograms.py.--> +@@ -46704,6 +46704,7 @@ Called by update_traffic_annotation_histograms.py.--> @@ -156,7 +156,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -103687,6 +103687,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. +@@ -103940,6 +103940,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. diff --git a/patches/BRM038_bromite-adblock-engine.patch b/patches/BRM038_bromite-adblock-engine.patch index 7e920ebd..8c18b0ea 100644 --- a/patches/BRM038_bromite-adblock-engine.patch +++ b/patches/BRM038_bromite-adblock-engine.patch @@ -11,7 +11,7 @@ Date: Tue Oct 10 20:23:06 2017 +0200 diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1745,6 +1745,8 @@ component("net") { +@@ -1744,6 +1744,8 @@ component("net") { "url_request/url_fetcher_response_writer.h", "url_request/url_range_request_job.cc", "url_request/url_range_request_job.h", diff --git a/patches/BRM039_play-videos-in-background.patch b/patches/BRM039_play-videos-in-background.patch index 3021f0f9..59f48f78 100644 --- a/patches/BRM039_play-videos-in-background.patch +++ b/patches/BRM039_play-videos-in-background.patch @@ -27,7 +27,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi #include "platform/CrossThreadFunctional.h" #include "platform/DateComponents.h" #include "platform/EventDispatchForbiddenScope.h" -@@ -5794,17 +5795,25 @@ void Document::FinishedParsing() { +@@ -5797,17 +5798,25 @@ void Document::FinishedParsing() { // determine whether this is a Google search results page const SecurityOrigin *origin = GetSecurityOrigin();