mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
patches/ungoogled: Update for 67
This commit is contained in:
xsmile
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -1224,6 +1224,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1243,6 +1243,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
"Enable stacking in tab strip",
|
||||
"Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
|
||||
kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
|
||||
@@ -15,7 +15,7 @@
|
||||
"Record histograms and user actions.",
|
||||
--- a/chrome/renderer/chrome_render_frame_observer.cc
|
||||
+++ b/chrome/renderer/chrome_render_frame_observer.cc
|
||||
@@ -141,9 +141,10 @@ ChromeRenderFrameObserver::ChromeRenderF
|
||||
@@ -146,9 +146,10 @@ ChromeRenderFrameObserver::ChromeRenderF
|
||||
if (!render_frame->IsMainFrame())
|
||||
return;
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
|
||||
SetClientSidePhishingDetection(true);
|
||||
#endif
|
||||
@@ -328,14 +329,16 @@ void ChromeRenderFrameObserver::DidFinis
|
||||
@@ -333,14 +334,16 @@ void ChromeRenderFrameObserver::DidFinis
|
||||
if (frame->Parent())
|
||||
return;
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
--- a/chrome/renderer/chrome_render_frame_observer.h
|
||||
+++ b/chrome/renderer/chrome_render_frame_observer.h
|
||||
@@ -98,6 +98,7 @@ class ChromeRenderFrameObserver : public
|
||||
@@ -99,6 +99,7 @@ class ChromeRenderFrameObserver : public
|
||||
// Have the same lifetime as us.
|
||||
translate::TranslateHelper* translate_helper_;
|
||||
safe_browsing::PhishingClassifierDelegate* phishing_classifier_;
|
||||
@@ -77,7 +77,7 @@
|
||||
} // namespace
|
||||
|
||||
// TemplateURLService::LessWithPrefix -----------------------------------------
|
||||
@@ -232,6 +238,7 @@ TemplateURLService::TemplateURLService(
|
||||
@@ -279,6 +285,7 @@ TemplateURLService::TemplateURLService(
|
||||
rappor::RapporServiceImpl* rappor_service,
|
||||
const base::Closure& dsp_change_callback)
|
||||
: prefs_(prefs),
|
||||
@@ -85,7 +85,7 @@
|
||||
search_terms_data_(std::move(search_terms_data)),
|
||||
web_data_service_(web_data_service),
|
||||
client_(std::move(client)),
|
||||
@@ -260,6 +267,7 @@ TemplateURLService::TemplateURLService(
|
||||
@@ -309,6 +316,7 @@ TemplateURLService::TemplateURLService(
|
||||
TemplateURLService::TemplateURLService(const Initializer* initializers,
|
||||
const int count)
|
||||
: prefs_(nullptr),
|
||||
@@ -93,7 +93,7 @@
|
||||
search_terms_data_(new SearchTermsData),
|
||||
web_data_service_(nullptr),
|
||||
google_url_tracker_(nullptr),
|
||||
@@ -314,7 +322,7 @@ bool TemplateURLService::CanAddAutogener
|
||||
@@ -365,7 +373,7 @@ bool TemplateURLService::CanAddAutogener
|
||||
if (existing_url) {
|
||||
// We already have a TemplateURL for this keyword. Only allow it to be
|
||||
// replaced if the TemplateURL can be replaced.
|
||||
@@ -102,7 +102,7 @@
|
||||
}
|
||||
|
||||
// We don't have a TemplateURL with keyword. We still may not allow this
|
||||
@@ -323,8 +331,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
@@ -374,8 +382,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
// that may interfere with search queries). An easy heuristic for this is
|
||||
// whether the user has a TemplateURL that has been manually modified (e.g.,
|
||||
// renamed) connected to the same host.
|
||||
@@ -113,7 +113,7 @@
|
||||
}
|
||||
|
||||
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
|
||||
@@ -1285,6 +1293,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
@@ -1351,6 +1359,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
|
||||
void TemplateURLService::Init(const Initializer* initializers,
|
||||
int num_initializers) {
|
||||
@@ -122,18 +122,17 @@
|
||||
if (client_)
|
||||
client_->SetOwner(this);
|
||||
|
||||
@@ -1516,16 +1526,17 @@ bool TemplateURLService::CanAddAutogener
|
||||
@@ -1583,6 +1593,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
|
||||
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
|
||||
const std::string& host) const {
|
||||
+ if (!should_autocollect_)
|
||||
+ return false;
|
||||
+
|
||||
const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
|
||||
if (!urls)
|
||||
- return true;
|
||||
+ return should_autocollect_;
|
||||
for (TemplateURLSet::const_iterator i(urls->begin()); i != urls->end(); ++i) {
|
||||
if (!(*i)->safe_for_autoreplace())
|
||||
return false;
|
||||
}
|
||||
- return true;
|
||||
+ return should_autocollect_;
|
||||
return true;
|
||||
@@ -1593,7 +1606,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
}
|
||||
|
||||
bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
|
||||
@@ -145,7 +144,7 @@
|
||||
TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -740,6 +740,8 @@ class TemplateURLService : public WebDat
|
||||
@@ -722,6 +722,8 @@ class TemplateURLService : public WebDat
|
||||
// ---------- Browser state related members ---------------------------------
|
||||
PrefService* prefs_;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
|
||||
+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
|
||||
@@ -25,6 +25,7 @@ ChromeAutocompleteSchemeClassifier::GetI
|
||||
@@ -28,6 +28,7 @@ ChromeAutocompleteSchemeClassifier::GetI
|
||||
if (base::IsStringASCII(scheme) &&
|
||||
(ProfileIOData::IsHandledProtocol(scheme) ||
|
||||
base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
|
||||
@@ -24,7 +24,7 @@
|
||||
url.SchemeIs(dom_distiller::kDomDistillerScheme))
|
||||
--- a/chrome/browser/ui/singleton_tabs.cc
|
||||
+++ b/chrome/browser/ui/singleton_tabs.cc
|
||||
@@ -101,7 +101,8 @@ int GetIndexOfExistingTab(Browser* brows
|
||||
@@ -100,7 +100,8 @@ int GetIndexOfExistingTab(Browser* brows
|
||||
|
||||
// Skip view-source tabs. This is needed because RewriteURLIfNecessary
|
||||
// removes the "view-source:" scheme which leads to incorrect matching.
|
||||
@@ -36,7 +36,7 @@
|
||||
GURL rewritten_tab_url = tab_url;
|
||||
--- a/components/omnibox/browser/autocomplete_input.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_input.cc
|
||||
@@ -487,7 +487,8 @@ void AutocompleteInput::ParseForEmphasiz
|
||||
@@ -491,7 +491,8 @@ void AutocompleteInput::ParseForEmphasiz
|
||||
int after_scheme_and_colon = parts.scheme.end() + 1;
|
||||
// For the view-source scheme, we should emphasize the scheme and host of the
|
||||
// URL qualified by the view-source prefix.
|
||||
@@ -46,7 +46,7 @@
|
||||
(static_cast<int>(text.length()) > after_scheme_and_colon)) {
|
||||
// Obtain the URL prefixed by view-source and parse it.
|
||||
base::string16 real_url(text.substr(after_scheme_and_colon));
|
||||
@@ -556,7 +557,9 @@ int AutocompleteInput::NumNonHostCompone
|
||||
@@ -564,7 +565,9 @@ int AutocompleteInput::NumNonHostCompone
|
||||
bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
|
||||
std::string utf8_input(base::UTF16ToUTF8(input));
|
||||
url::Component scheme;
|
||||
@@ -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
|
||||
@@ -336,6 +336,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
@@ -335,6 +335,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
RegisterWebSafeScheme(url::kHttpsScheme);
|
||||
RegisterWebSafeScheme(url::kFtpScheme);
|
||||
RegisterWebSafeScheme(url::kDataScheme);
|
||||
@@ -77,7 +77,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/synchronization/lock.h"
|
||||
#include "base/threading/thread_task_runner_handle.h"
|
||||
@@ -42,6 +43,7 @@
|
||||
@@ -43,6 +44,7 @@
|
||||
#include "net/url_request/url_request_redirect_job.h"
|
||||
#include "url/gurl.h"
|
||||
#include "url/origin.h"
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
#if BUILDFLAG(ENABLE_REPORTING)
|
||||
#include "net/network_error_logging/network_error_logging_service.h"
|
||||
@@ -581,6 +583,12 @@ URLRequest::URLRequest(const GURL& url,
|
||||
@@ -583,6 +585,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
|
||||
@@ -1735,6 +1735,8 @@ component("net") {
|
||||
@@ -1743,6 +1743,8 @@ component("net") {
|
||||
"url_request/report_sender.h",
|
||||
"url_request/static_http_user_agent_settings.cc",
|
||||
"url_request/static_http_user_agent_settings.h",
|
||||
@@ -164,7 +164,7 @@
|
||||
DCHECK(set_protocol);
|
||||
--- a/chrome/browser/profiles/profile_io_data.cc
|
||||
+++ b/chrome/browser/profiles/profile_io_data.cc
|
||||
@@ -101,6 +101,7 @@
|
||||
@@ -99,6 +99,7 @@
|
||||
#include "net/url_request/file_protocol_handler.h"
|
||||
#include "net/url_request/ftp_protocol_handler.h"
|
||||
#include "net/url_request/report_sender.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"
|
||||
@@ -1327,6 +1328,9 @@ ProfileIOData::SetUpJobFactoryDefaults(
|
||||
@@ -1321,6 +1322,9 @@ ProfileIOData::SetUpJobFactoryDefaults(
|
||||
set_protocol = job_factory->SetProtocolHandler(
|
||||
url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
|
||||
DCHECK(set_protocol);
|
||||
@@ -184,7 +184,7 @@
|
||||
set_protocol = job_factory->SetProtocolHandler(
|
||||
--- a/chromecast/browser/url_request_context_factory.cc
|
||||
+++ b/chromecast/browser/url_request_context_factory.cc
|
||||
@@ -42,6 +42,7 @@
|
||||
@@ -41,6 +41,7 @@
|
||||
#include "net/ssl/ssl_config_service_defaults.h"
|
||||
#include "net/url_request/data_protocol_handler.h"
|
||||
#include "net/url_request/file_protocol_handler.h"
|
||||
@@ -192,7 +192,7 @@
|
||||
#include "net/url_request/url_request_context.h"
|
||||
#include "net/url_request/url_request_context_builder.h"
|
||||
#include "net/url_request/url_request_context_getter.h"
|
||||
@@ -286,6 +287,9 @@ void URLRequestContextFactory::Initializ
|
||||
@@ -284,6 +285,9 @@ void URLRequestContextFactory::Initializ
|
||||
set_protocol = job_factory->SetProtocolHandler(
|
||||
url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
|
||||
DCHECK(set_protocol);
|
||||
@@ -269,7 +269,7 @@
|
||||
+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
|
||||
--- a/net/url_request/url_request_context_builder.cc
|
||||
+++ b/net/url_request/url_request_context_builder.cc
|
||||
@@ -41,6 +41,7 @@
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "net/ssl/ssl_config_service_defaults.h"
|
||||
#include "net/url_request/data_protocol_handler.h"
|
||||
#include "net/url_request/static_http_user_agent_settings.h"
|
||||
@@ -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"
|
||||
@@ -596,6 +597,8 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
@@ -595,6 +596,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
|
||||
@@ -49,6 +49,7 @@ const char* kSecureSchemes[] = {
|
||||
@@ -52,6 +52,7 @@ const char* kSecureSchemes[] = {
|
||||
kHttpsScheme,
|
||||
kAboutScheme,
|
||||
kDataScheme,
|
||||
@@ -296,9 +296,9 @@
|
||||
kWssScheme,
|
||||
};
|
||||
|
||||
@@ -66,6 +67,7 @@ const char* kCORSEnabledSchemes[] = {
|
||||
kHttpScheme,
|
||||
@@ -69,6 +70,7 @@ const char* kCORSEnabledSchemes[] = {
|
||||
kHttpsScheme,
|
||||
kHttpScheme,
|
||||
kDataScheme,
|
||||
+ kTraceScheme,
|
||||
};
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/app/chrome_command_ids.h
|
||||
+++ b/chrome/app/chrome_command_ids.h
|
||||
@@ -150,6 +150,7 @@
|
||||
@@ -152,6 +152,7 @@
|
||||
#define IDC_DEV_TOOLS_INSPECT 40023
|
||||
#define IDC_UPGRADE_DIALOG 40024
|
||||
#define IDC_VIEW_INCOMPATIBILITIES 40025
|
||||
@@ -12,7 +12,7 @@
|
||||
#define IDC_BOOKMARKS_MENU 40029
|
||||
--- a/chrome/app/generated_resources.grd
|
||||
+++ b/chrome/app/generated_resources.grd
|
||||
@@ -1050,6 +1050,9 @@ are declared in build/common.gypi.
|
||||
@@ -1053,6 +1053,9 @@ are declared in build/common.gypi.
|
||||
<message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
|
||||
&Clear browsing data...
|
||||
</message>
|
||||
@@ -22,7 +22,7 @@
|
||||
<message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
|
||||
&Downloads
|
||||
</message>
|
||||
@@ -1088,6 +1091,9 @@ are declared in build/common.gypi.
|
||||
@@ -1091,6 +1094,9 @@ are declared in build/common.gypi.
|
||||
<message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
|
||||
&Clear Browsing Data...
|
||||
</message>
|
||||
@@ -78,9 +78,9 @@
|
||||
|
||||
--- a/chrome/browser/ui/browser_command_controller.cc
|
||||
+++ b/chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -59,6 +59,9 @@
|
||||
@@ -60,6 +60,9 @@
|
||||
#include "extensions/browser/extension_system.h"
|
||||
#include "printing/features/features.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "ui/events/keycodes/keyboard_codes.h"
|
||||
+#include "net/url_request/url_request_context.h"
|
||||
+#include "net/url_request/url_request_context_getter.h"
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
#include "chrome/browser/ui/browser_commands_mac.h"
|
||||
@@ -624,6 +627,9 @@ bool BrowserCommandController::ExecuteCo
|
||||
@@ -629,6 +632,9 @@ bool BrowserCommandController::ExecuteCo
|
||||
case IDC_CLEAR_BROWSING_DATA:
|
||||
ShowClearBrowsingDataDialog(browser_);
|
||||
break;
|
||||
@@ -98,7 +98,7 @@
|
||||
case IDC_IMPORT_SETTINGS:
|
||||
ShowImportDialog(browser_);
|
||||
break;
|
||||
@@ -865,6 +871,7 @@ void BrowserCommandController::InitComma
|
||||
@@ -871,6 +877,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
|
||||
@@ -114814,6 +114814,7 @@ http://cs/file:chrome/histograms.xml - b
|
||||
@@ -118373,6 +118373,7 @@ http://cs/file:chrome/histograms.xml - b
|
||||
<suffix name="OpenInChrome"/>
|
||||
<suffix name="SiteSettings"/>
|
||||
<suffix name="AppInfo"/>
|
||||
@@ -142,7 +142,7 @@
|
||||
|
||||
--- a/tools/metrics/histograms/enums.xml
|
||||
+++ b/tools/metrics/histograms/enums.xml
|
||||
@@ -46999,6 +46999,7 @@ Called by update_traffic_annotation_hist
|
||||
@@ -48307,6 +48307,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,7 +2,7 @@
|
||||
|
||||
--- a/components/domain_reliability/google_configs.cc
|
||||
+++ b/components/domain_reliability/google_configs.cc
|
||||
@@ -13,574 +13,10 @@
|
||||
@@ -13,575 +13,10 @@
|
||||
|
||||
namespace domain_reliability {
|
||||
|
||||
@@ -344,6 +344,7 @@
|
||||
- {"googletagmanager.com", true, false, false},
|
||||
- {"googletagservices.com", true, false, false},
|
||||
- {"googleusercontent.com", true, false, false},
|
||||
- {"googlezip.net", true, false, false},
|
||||
- {"gstatic.cn", true, false, false},
|
||||
- {"gstatic.com", true, false, false},
|
||||
- {"gvt3.com", true, false, false},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
|
||||
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
|
||||
@@ -445,7 +445,7 @@ void PepperFileIOHost::OnLocalFileOpened
|
||||
@@ -440,7 +440,7 @@ void PepperFileIOHost::OnLocalFileOpened
|
||||
ppapi::host::ReplyMessageContext reply_context,
|
||||
const base::FilePath& path,
|
||||
base::File::Error error_code) {
|
||||
@@ -11,7 +11,7 @@
|
||||
// Quarantining a file before its contents are available is only supported on
|
||||
// Windows and Linux.
|
||||
if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
|
||||
@@ -465,7 +465,7 @@ void PepperFileIOHost::OnLocalFileOpened
|
||||
@@ -460,7 +460,7 @@ void PepperFileIOHost::OnLocalFileOpened
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -41,17 +41,17 @@
|
||||
void SendFileOpenReply(ppapi::host::ReplyMessageContext reply_context,
|
||||
base::File::Error error_code);
|
||||
|
||||
--- a/content/browser/download/base_file.cc
|
||||
+++ b/content/browser/download/base_file.cc
|
||||
@@ -20,7 +20,6 @@
|
||||
#include "build/build_config.h"
|
||||
--- a/components/download/internal/common/base_file.cc
|
||||
+++ b/components/download/internal/common/base_file.cc
|
||||
@@ -21,7 +21,6 @@
|
||||
#include "components/download/public/common/download_interrupt_reasons_utils.h"
|
||||
#include "components/download/public/common/download_item.h"
|
||||
#include "components/download/public/common/download_stats.h"
|
||||
-#include "components/download/quarantine/quarantine.h"
|
||||
#include "content/browser/download/download_interrupt_reasons_utils.h"
|
||||
#include "crypto/secure_hash.h"
|
||||
#include "net/base/net_errors.h"
|
||||
@@ -439,7 +438,7 @@ download::DownloadInterruptReason BaseFi
|
||||
|
||||
#define CONDITIONAL_TRACE(trace) \
|
||||
@@ -432,7 +431,7 @@ DownloadInterruptReason BaseFile::LogInt
|
||||
return reason;
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -523,7 +522,7 @@ download::DownloadInterruptReason BaseFi
|
||||
@@ -516,7 +515,7 @@ DownloadInterruptReason BaseFile::Annota
|
||||
}
|
||||
return download::DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
|
||||
return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
|
||||
}
|
||||
-#else // !OS_WIN && !OS_MACOSX && !OS_LINUX
|
||||
+#else // 1
|
||||
download::DownloadInterruptReason BaseFile::AnnotateWithSourceInformation(
|
||||
DownloadInterruptReason BaseFile::AnnotateWithSourceInformation(
|
||||
const std::string& client_guid,
|
||||
const GURL& source_url,
|
||||
--- a/components/download/quarantine/quarantine.cc
|
||||
@@ -94,5 +94,5 @@
|
||||
"//components/download/public/common:public",
|
||||
- "//components/download/quarantine",
|
||||
"//components/filename_generation",
|
||||
"//components/filesystem:lib",
|
||||
"//components/leveldb:lib",
|
||||
"//components/link_header_util",
|
||||
"//components/metrics",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/net/base/url_util.cc
|
||||
+++ b/net/base/url_util.cc
|
||||
@@ -397,28 +397,6 @@ void GetIdentityFromURL(const GURL& url,
|
||||
@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url,
|
||||
}
|
||||
|
||||
bool HasGoogleHost(const GURL& url) {
|
||||
@@ -136,18 +136,19 @@
|
||||
bool IsGoogleSearchResultUrl(const GURL& url) {
|
||||
--- a/components/search_engines/template_url.cc
|
||||
+++ b/components/search_engines/template_url.cc
|
||||
@@ -510,11 +510,6 @@ base::string16 TemplateURLRef::SearchTer
|
||||
@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTer
|
||||
bool TemplateURLRef::HasGoogleBaseURLs(
|
||||
const SearchTermsData& search_terms_data) const {
|
||||
ParseIfNecessary(search_terms_data);
|
||||
- for (size_t i = 0; i < replacements_.size(); ++i) {
|
||||
- if ((replacements_[i].type == GOOGLE_BASE_URL) ||
|
||||
- (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL))
|
||||
- return true;
|
||||
- }
|
||||
return false;
|
||||
- return std::any_of(replacements_.begin(), replacements_.end(),
|
||||
- [](const Replacement& replacement) {
|
||||
- return replacement.type == GOOGLE_BASE_URL ||
|
||||
- replacement.type == GOOGLE_BASE_SUGGEST_URL;
|
||||
- });
|
||||
+ return false;
|
||||
}
|
||||
|
||||
bool TemplateURLRef::ExtractSearchTermsFromURL(
|
||||
--- a/components/google/core/browser/google_util.cc
|
||||
+++ b/components/google/core/browser/google_util.cc
|
||||
@@ -41,118 +41,16 @@ namespace {
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
--- a/chrome/browser/intranet_redirect_detector.cc
|
||||
+++ b/chrome/browser/intranet_redirect_detector.cc
|
||||
@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSle
|
||||
fetchers_.clear();
|
||||
@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSle
|
||||
simple_loaders_.clear();
|
||||
resulting_origins_.clear();
|
||||
|
||||
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
||||
@@ -12,5 +12,5 @@
|
||||
- return;
|
||||
+ return;
|
||||
|
||||
DCHECK(fetchers_.empty() && resulting_origins_.empty());
|
||||
DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
|
||||
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -306,7 +306,6 @@ if (!is_android && !is_mac) {
|
||||
@@ -314,7 +314,6 @@ if (!is_android && !is_mac) {
|
||||
}
|
||||
|
||||
data_deps += [
|
||||
- "//chrome/browser/resources/media/mei_preload:component",
|
||||
"//third_party/widevine/cdm:widevinecdmadapter",
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
|
||||
@@ -1283,7 +1282,6 @@ if (is_win) {
|
||||
@@ -1289,7 +1288,6 @@ if (is_win) {
|
||||
":widevine_cdm_library",
|
||||
"//build/config:exe_and_shlib_deps",
|
||||
"//chrome/app/nibs:chrome_xibs",
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
|
||||
--- a/chrome/browser/ui/chrome_pages.cc
|
||||
+++ b/chrome/browser/ui/chrome_pages.cc
|
||||
@@ -76,12 +76,6 @@ void OpenBookmarkManagerForNode(Browser*
|
||||
@@ -77,12 +77,6 @@ void OpenBookmarkManagerForNode(Browser*
|
||||
ShowSingletonTabOverwritingNTP(browser, params);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Shows either the help app or the appropriate help page for |source|. If
|
||||
// |browser| is NULL and the help page is used (vs the app), the help page is
|
||||
// shown in the last active browser. If there is no such browser, a new browser
|
||||
@@ -396,46 +390,6 @@ void ShowSearchEngineSettings(Browser* b
|
||||
@@ -397,51 +391,6 @@ void ShowSearchEngineSettings(Browser* b
|
||||
#if !defined(OS_ANDROID)
|
||||
void ShowBrowserSignin(Browser* browser,
|
||||
signin_metrics::AccessPoint access_point) {
|
||||
@@ -44,31 +44,36 @@
|
||||
-
|
||||
-#if defined(OS_CHROMEOS)
|
||||
- // ChromeOS doesn't have the avatar bubble.
|
||||
- const bool can_show_avatar_bubble = false;
|
||||
- const bool show_full_tab_chrome_signin_page = true;
|
||||
-#else
|
||||
- // The sign-in modal dialog is presented as a tab-modal dialog (which is
|
||||
- // automatically dismissed when the page navigates). Displaying the dialog on
|
||||
- // a new tab that loads any page will lead to it being dismissed as soon as
|
||||
- // the new tab is loaded. So the sign-in dialog must only be presented on top
|
||||
- // of an existing tab.
|
||||
- // When Desktop Identity Consistency (aka DICE) is not enabled, Chrome uses
|
||||
- // a modal sign-in dialog for signing in. This sign-in modal dialog is
|
||||
- // presented as a tab-modal dialog (which is automatically dismissed when
|
||||
- // the page navigates). Displaying the dialog on a new tab that loads any
|
||||
- // page will lead to it being dismissed as soon as the new tab is loaded.
|
||||
- // So the sign-in dialog must only be presented on top of an existing tab.
|
||||
- //
|
||||
- // If ScopedTabbedBrowserDisplayer had to create a (non-incognito) Browser*,
|
||||
- // it won't have any tabs yet. Fallback to the full-tab sign-in flow in this
|
||||
- // case.
|
||||
- const bool can_show_avatar_bubble = !browser->tab_strip_model()->empty();
|
||||
- const bool show_full_tab_chrome_signin_page =
|
||||
- !signin::DiceMethodGreaterOrEqual(
|
||||
- AccountConsistencyModeManager::GetMethodForProfile(
|
||||
- browser->profile()),
|
||||
- signin::AccountConsistencyMethod::kDicePrepareMigration) &&
|
||||
- browser->tab_strip_model()->empty();
|
||||
-#endif // defined(OS_CHROMEOS)
|
||||
-
|
||||
- if (can_show_avatar_bubble) {
|
||||
- browser->window()->ShowAvatarBubbleFromAvatarButton(
|
||||
- BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
|
||||
- signin::ManageAccountsParams(), access_point, false);
|
||||
- } else {
|
||||
- if (show_full_tab_chrome_signin_page) {
|
||||
- NavigateToSingletonTab(
|
||||
- browser,
|
||||
- signin::GetPromoURLForTab(
|
||||
- access_point, signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT,
|
||||
- false));
|
||||
- DCHECK_GT(browser->tab_strip_model()->count(), 0);
|
||||
- } else {
|
||||
- browser->window()->ShowAvatarBubbleFromAvatarButton(
|
||||
- BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
|
||||
- signin::ManageAccountsParams(), access_point, false);
|
||||
- }
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/plugins/plugins_resource_service.cc
|
||||
+++ b/chrome/browser/plugins/plugins_resource_service.cc
|
||||
@@ -52,9 +52,6 @@ const int kStartResourceFetchDelayMs = 6
|
||||
@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 6
|
||||
// Delay between calls to update the cache 1 day and 2 minutes in testing mode.
|
||||
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
GURL GetPluginsServerURL() {
|
||||
std::string filename;
|
||||
#if defined(OS_WIN)
|
||||
@@ -69,7 +66,7 @@ GURL GetPluginsServerURL() {
|
||||
@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
|
||||
#error Unknown platform
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
} // namespace
|
||||
--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
|
||||
+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
|
||||
@@ -34,8 +34,6 @@ namespace safe_browsing {
|
||||
@@ -35,8 +35,6 @@ namespace safe_browsing {
|
||||
// Model Loader strings
|
||||
const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
|
||||
const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
|
||||
@@ -32,34 +32,34 @@
|
||||
const char ModelLoader::kClientModelNamePattern[] =
|
||||
"client_model_v5%s_variation_%d.pb";
|
||||
const char ModelLoader::kClientModelFinchExperiment[] =
|
||||
@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure u
|
||||
net::URLRequestContextGetter* request_context_getter,
|
||||
bool is_extended_reporting)
|
||||
@@ -90,7 +88,7 @@ ModelLoader::ModelLoader(
|
||||
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
|
||||
bool is_extended_reporting)
|
||||
: name_(FillInModelName(is_extended_reporting, GetModelNumber())),
|
||||
- url_(kClientModelUrlPrefix + name_),
|
||||
+ url_("about:blank"),
|
||||
update_renderers_callback_(update_renderers_callback),
|
||||
request_context_getter_(request_context_getter),
|
||||
url_loader_factory_(url_loader_factory),
|
||||
weak_factory_(this) {
|
||||
@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure u
|
||||
ModelLoader::ModelLoader(base::Closure update_renderers_callback,
|
||||
const std::string& model_name)
|
||||
@@ -103,7 +101,7 @@ ModelLoader::ModelLoader(
|
||||
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
|
||||
const std::string& model_name)
|
||||
: name_(model_name),
|
||||
- url_(kClientModelUrlPrefix + name_),
|
||||
+ url_("about:blank"),
|
||||
update_renderers_callback_(update_renderers_callback),
|
||||
request_context_getter_(NULL),
|
||||
url_loader_factory_(url_loader_factory),
|
||||
weak_factory_(this) {
|
||||
--- a/chrome/browser/safe_browsing/client_side_model_loader.h
|
||||
+++ b/chrome/browser/safe_browsing/client_side_model_loader.h
|
||||
@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetch
|
||||
@@ -42,7 +42,6 @@ class ModelLoader {
|
||||
static const int kClientModelFetchIntervalMs;
|
||||
static const char kClientModelFinchExperiment[];
|
||||
static const char kClientModelFinchParam[];
|
||||
- static const char kClientModelUrlPrefix[];
|
||||
static const char kClientModelNamePattern[];
|
||||
|
||||
// Constructs a model loader to fetch a model using |request_context_getter|.
|
||||
// Constructs a model loader to fetch a model using |url_loader_factory|.
|
||||
--- a/rlz/lib/lib_values.cc
|
||||
+++ b/rlz/lib/lib_values.cc
|
||||
@@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = "
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
--- a/rlz/lib/financial_ping.cc
|
||||
+++ b/rlz/lib/financial_ping.cc
|
||||
@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const cha
|
||||
@@ -351,7 +351,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
|
||||
// Open network connection.
|
||||
InternetHandle connection_handle = InternetConnectA(inet_handle,
|
||||
@@ -90,9 +90,9 @@
|
||||
+ "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
|
||||
INTERNET_FLAG_NO_CACHE_WRITE, 0);
|
||||
if (!connection_handle)
|
||||
return false;
|
||||
@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const cha
|
||||
return true;
|
||||
return PING_FAILURE;
|
||||
@@ -395,7 +395,7 @@ FinancialPing::PingResponse FinancialPin
|
||||
return PING_SUCCESSFUL;
|
||||
#else
|
||||
std::string url =
|
||||
- base::StringPrintf("https://%s%s", kFinancialServer, request);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/content/public/common/url_utils.cc
|
||||
+++ b/content/public/common/url_utils.cc
|
||||
@@ -19,11 +19,7 @@ bool HasWebUIScheme(const GURL& url) {
|
||||
@@ -20,11 +20,7 @@ bool HasWebUIScheme(const GURL& url) {
|
||||
}
|
||||
|
||||
bool IsSavableURL(const GURL& url) {
|
||||
@@ -30,7 +30,7 @@
|
||||
if (current_tab->ShowingInterstitialPage())
|
||||
content_restrictions |= CONTENT_RESTRICTION_PRINT;
|
||||
}
|
||||
@@ -885,8 +879,7 @@ bool CanSavePage(const Browser* browser)
|
||||
@@ -886,8 +880,7 @@ bool CanSavePage(const Browser* browser)
|
||||
prefs::kAllowFileSelectionDialogs)) {
|
||||
return false;
|
||||
}
|
||||
@@ -53,8 +53,8 @@
|
||||
OfflinePageModel::OfflinePageModel() = default;
|
||||
--- a/content/common/url_schemes.cc
|
||||
+++ b/content/common/url_schemes.cc
|
||||
@@ -27,6 +27,10 @@ std::vector<url::Origin>* secure_origins
|
||||
std::vector<std::string>* service_worker_schemes = nullptr;
|
||||
@@ -19,6 +19,10 @@ namespace content {
|
||||
namespace {
|
||||
|
||||
const char* const kDefaultSavableSchemes[] = {
|
||||
+ url::kAboutScheme,
|
||||
@@ -64,7 +64,7 @@
|
||||
url::kHttpScheme,
|
||||
url::kHttpsScheme,
|
||||
url::kFileScheme,
|
||||
@@ -34,7 +38,13 @@ const char* const kDefaultSavableSchemes
|
||||
@@ -26,7 +30,13 @@ const char* const kDefaultSavableSchemes
|
||||
url::kFtpScheme,
|
||||
kChromeDevToolsScheme,
|
||||
kChromeUIScheme,
|
||||
@@ -78,4 +78,4 @@
|
||||
+ kViewSourceScheme
|
||||
};
|
||||
|
||||
} // namespace
|
||||
// These lists are lazily initialized below and are leaked on shutdown to
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -114,6 +114,7 @@
|
||||
@@ -117,6 +117,7 @@
|
||||
#include "services/network/public/cpp/network_switches.h"
|
||||
#include "services/service_manager/sandbox/switches.h"
|
||||
#include "third_party/libaom/av1_features.h"
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "ui/app_list/app_list_features.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/base/ui_base_switches.h"
|
||||
@@ -1236,6 +1237,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1255,6 +1256,10 @@ 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")},
|
||||
@@ -27,32 +27,32 @@
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "services/device/public/cpp/device_features.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "third_party/WebKit/public/platform/WebRuntimeFeatures.h"
|
||||
#include "third_party/blink/public/platform/web_runtime_features.h"
|
||||
+#include "third_party/ungoogled/ungoogled_switches.h"
|
||||
#include "ui/gfx/switches.h"
|
||||
#include "ui/gl/gl_switches.h"
|
||||
#include "ui/native_theme/native_theme_features.h"
|
||||
@@ -435,6 +436,9 @@ void SetRuntimeFeaturesDefaultsAndUpdate
|
||||
@@ -449,6 +450,9 @@ void SetRuntimeFeaturesDefaultsAndUpdate
|
||||
|
||||
if (base::FeatureList::IsEnabled(features::kUnifiedTouchAdjustment))
|
||||
WebRuntimeFeatures::EnableUnifiedTouchAdjustment(true);
|
||||
WebRuntimeFeatures::EnableOffMainThreadWebSocket(
|
||||
base::FeatureList::IsEnabled(features::kOffMainThreadWebSocket));
|
||||
+
|
||||
+ WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(
|
||||
+ command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
|
||||
};
|
||||
|
||||
} // namespace content
|
||||
--- a/third_party/WebKit/Source/core/dom/Document.cpp
|
||||
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
|
||||
@@ -29,6 +29,7 @@
|
||||
--- a/third_party/blink/renderer/core/dom/document.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/document.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "core/dom/Document.h"
|
||||
#include <memory>
|
||||
|
||||
+#include "base/rand_util.h"
|
||||
#include "bindings/core/v8/ExceptionMessages.h"
|
||||
#include "bindings/core/v8/ExceptionState.h"
|
||||
#include "bindings/core/v8/ScriptController.h"
|
||||
@@ -729,6 +730,15 @@ Document::Document(const DocumentInit& i
|
||||
#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"
|
||||
@@ -737,6 +738,15 @@ Document::Document(const DocumentInit& i
|
||||
#ifndef NDEBUG
|
||||
liveDocumentSet().insert(this);
|
||||
#endif
|
||||
@@ -68,7 +68,7 @@
|
||||
}
|
||||
|
||||
Document::~Document() {
|
||||
@@ -755,6 +765,14 @@ Range* Document::CreateRangeAdjustedToTr
|
||||
@@ -763,6 +773,14 @@ Range* Document::CreateRangeAdjustedToTr
|
||||
Position::BeforeNode(*shadow_host));
|
||||
}
|
||||
|
||||
@@ -83,9 +83,9 @@
|
||||
SelectorQueryCache& Document::GetSelectorQueryCache() {
|
||||
if (!selector_query_cache_)
|
||||
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
|
||||
--- a/third_party/WebKit/Source/core/dom/Document.h
|
||||
+++ b/third_party/WebKit/Source/core/dom/Document.h
|
||||
@@ -406,6 +406,10 @@ class CORE_EXPORT Document : public Cont
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -408,6 +408,10 @@ class CORE_EXPORT Document : public Cont
|
||||
|
||||
String origin() const;
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
String visibilityState() const;
|
||||
mojom::PageVisibilityState GetPageVisibilityState() const;
|
||||
bool hidden() const;
|
||||
@@ -1663,6 +1667,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -1670,6 +1674,9 @@ class CORE_EXPORT Document : public Cont
|
||||
|
||||
double start_time_;
|
||||
|
||||
@@ -106,9 +106,9 @@
|
||||
TraceWrapperMember<ScriptRunner> script_runner_;
|
||||
|
||||
HeapVector<Member<ScriptElementBase>> current_script_stack_;
|
||||
--- a/third_party/WebKit/Source/core/dom/Element.cpp
|
||||
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
|
||||
@@ -1327,6 +1327,11 @@ DOMRectList* Element::getClientRects() {
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -1348,6 +1348,11 @@ DOMRectList* Element::getClientRects() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
|
||||
quads, *element_layout_object);
|
||||
@@ -120,7 +120,7 @@
|
||||
return DOMRectList::Create(quads);
|
||||
}
|
||||
|
||||
@@ -1344,6 +1349,9 @@ DOMRect* Element::getBoundingClientRect(
|
||||
@@ -1365,6 +1370,9 @@ DOMRect* Element::getBoundingClientRect(
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -130,9 +130,9 @@
|
||||
return DOMRect::FromFloatRect(result);
|
||||
}
|
||||
|
||||
--- a/third_party/WebKit/Source/core/dom/Range.cpp
|
||||
+++ b/third_party/WebKit/Source/core/dom/Range.cpp
|
||||
@@ -1589,11 +1589,21 @@ DOMRectList* Range::getClientRects() con
|
||||
--- a/third_party/blink/renderer/core/dom/range.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/range.cc
|
||||
@@ -1575,11 +1575,21 @@ DOMRectList* Range::getClientRects() con
|
||||
Vector<FloatQuad> quads;
|
||||
GetBorderAndTextQuads(quads);
|
||||
|
||||
@@ -155,9 +155,9 @@
|
||||
}
|
||||
|
||||
// TODO(editing-dev): We should make
|
||||
--- a/third_party/WebKit/Source/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
|
||||
@@ -432,6 +432,9 @@
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -477,6 +477,9 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
@@ -167,10 +167,10 @@
|
||||
name: "FocusOptions",
|
||||
status: "stable",
|
||||
},
|
||||
--- a/third_party/WebKit/Source/platform/exported/WebRuntimeFeatures.cpp
|
||||
+++ b/third_party/WebKit/Source/platform/exported/WebRuntimeFeatures.cpp
|
||||
@@ -506,4 +506,8 @@ void WebRuntimeFeatures::EnableMojoBlobU
|
||||
RuntimeEnabledFeatures::SetMojoBlobURLsEnabled(enable);
|
||||
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
|
||||
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
|
||||
@@ -518,4 +518,8 @@ void WebRuntimeFeatures::EnableOffMainTh
|
||||
RuntimeEnabledFeatures::SetOffMainThreadWebSocketEnabled(enable);
|
||||
}
|
||||
|
||||
+void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
|
||||
@@ -178,19 +178,19 @@
|
||||
+}
|
||||
+
|
||||
} // namespace blink
|
||||
--- a/third_party/WebKit/public/platform/WebRuntimeFeatures.h
|
||||
+++ b/third_party/WebKit/public/platform/WebRuntimeFeatures.h
|
||||
@@ -188,6 +188,7 @@ class WebRuntimeFeatures {
|
||||
BLINK_PLATFORM_EXPORT static void EnableCodeCacheAfterExecute(bool);
|
||||
--- a/third_party/blink/public/platform/web_runtime_features.h
|
||||
+++ b/third_party/blink/public/platform/web_runtime_features.h
|
||||
@@ -189,6 +189,7 @@ class WebRuntimeFeatures {
|
||||
BLINK_PLATFORM_EXPORT static void EnableUnifiedTouchAdjustment(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableMojoBlobURLs(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableOffMainThreadWebSocket(bool);
|
||||
+ BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
|
||||
|
||||
private:
|
||||
WebRuntimeFeatures();
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -1811,6 +1811,7 @@ jumbo_split_static_library("browser") {
|
||||
@@ -1813,6 +1813,7 @@ jumbo_split_static_library("browser") {
|
||||
"//third_party/metrics_proto",
|
||||
"//third_party/re2",
|
||||
"//third_party/smhasher:cityhash",
|
||||
@@ -210,15 +210,15 @@
|
||||
"//third_party/zlib/google:zip",
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -205,6 +205,7 @@
|
||||
@@ -209,6 +209,7 @@
|
||||
#include "storage/browser/fileapi/sandbox_file_system_backend.h"
|
||||
#include "third_party/WebKit/public/common/page/launching_process_state.h"
|
||||
#include "third_party/WebKit/public/public_features.h"
|
||||
#include "third_party/blink/public/common/page/launching_process_state.h"
|
||||
#include "third_party/blink/public/public_buildflags.h"
|
||||
+#include "third_party/ungoogled/ungoogled_switches.h"
|
||||
#include "third_party/skia/include/core/SkBitmap.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/base/ui_base_switches.h"
|
||||
@@ -2589,6 +2590,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -2763,6 +2764,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kEnableWebGLImageChromium,
|
||||
switches::kEnableWebVR,
|
||||
switches::kExplicitlyAllowedPorts,
|
||||
@@ -229,17 +229,17 @@
|
||||
--- a/content/child/BUILD.gn
|
||||
+++ b/content/child/BUILD.gn
|
||||
@@ -126,6 +126,7 @@ target(link_target_type, "child") {
|
||||
"//third_party/WebKit/public:scaled_resources",
|
||||
"//third_party/WebKit/public/common",
|
||||
"//third_party/blink/public:scaled_resources",
|
||||
"//third_party/blink/public/common",
|
||||
"//third_party/ced",
|
||||
+ "//third_party/ungoogled:switches",
|
||||
"//third_party/zlib/google:compression_utils",
|
||||
"//ui/base",
|
||||
"//ui/events/gestures/blink",
|
||||
--- a/third_party/WebKit/Source/platform/BUILD.gn
|
||||
+++ b/third_party/WebKit/Source/platform/BUILD.gn
|
||||
@@ -1562,6 +1562,7 @@ jumbo_component("platform") {
|
||||
"//third_party/WebKit/public:offscreen_canvas_mojo_bindings_blink",
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1558,6 +1558,7 @@ jumbo_component("platform") {
|
||||
"//third_party/blink/public:offscreen_canvas_mojo_bindings_blink",
|
||||
"//third_party/ced",
|
||||
"//third_party/icu",
|
||||
+ "//third_party/ungoogled:switches",
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
}
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -419,10 +419,6 @@ split_static_library("ui") {
|
||||
@@ -420,10 +420,6 @@ split_static_library("ui") {
|
||||
"cocoa/omnibox/omnibox_view_mac.mm",
|
||||
"cocoa/omnibox_decoration_bubble_controller.h",
|
||||
"cocoa/omnibox_decoration_bubble_controller.mm",
|
||||
@@ -47,10 +47,10 @@
|
||||
"cocoa/page_info/page_info_bubble_controller.h",
|
||||
"cocoa/page_info/page_info_bubble_controller.mm",
|
||||
"cocoa/page_info/page_info_utils_cocoa.h",
|
||||
@@ -3250,8 +3246,6 @@ split_static_library("ui") {
|
||||
@@ -3306,8 +3302,6 @@ split_static_library("ui") {
|
||||
"views/profiles/forced_reauthentication_dialog_view.h",
|
||||
"views/profiles/signin_view_controller_delegate_views.cc",
|
||||
"views/profiles/signin_view_controller_delegate_views.h",
|
||||
"views/screen_capture_notification_ui_views.cc",
|
||||
- "views/sync/one_click_signin_dialog_view.cc",
|
||||
- "views/sync/one_click_signin_dialog_view.h",
|
||||
"views/touch_uma/touch_uma.cc",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -71,7 +71,7 @@ void ShowBadFlagsPrompt(Browser* browser
|
||||
@@ -55,7 +55,7 @@ static const char* kBadFlags[] = {
|
||||
// These flags disable sandbox-related security.
|
||||
service_manager::switches::kDisableGpuSandbox,
|
||||
service_manager::switches::kDisableSeccompFilterSandbox,
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
# This also fixes local debugging with domain substitution
|
||||
# Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c14
|
||||
|
||||
--- a/third_party/WebKit/Source/devtools/BUILD.gn
|
||||
+++ b/third_party/WebKit/Source/devtools/BUILD.gn
|
||||
@@ -1114,10 +1114,8 @@ action("generate_devtools_grd") {
|
||||
--- a/third_party/blink/renderer/devtools/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/devtools/BUILD.gn
|
||||
@@ -1124,10 +1124,8 @@ action("generate_devtools_grd") {
|
||||
devtools_embedder_scripts +
|
||||
[ "$resources_out_dir/devtools_extension_api.js" ]
|
||||
|
||||
@@ -18,18 +18,8 @@
|
||||
|
||||
inputs = grd_files + devtools_image_files
|
||||
outfile = "$root_gen_dir/devtools/devtools_resources.grd"
|
||||
--- a/third_party/WebKit/Source/devtools/front_end/inspector.json
|
||||
+++ b/third_party/WebKit/Source/devtools/front_end/inspector.json
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"modules" : [
|
||||
- { "name": "screencast", "type": "remote" }
|
||||
+ { "name": "screencast" }
|
||||
],
|
||||
"extends": "devtools_app",
|
||||
"has_html": true
|
||||
--- a/third_party/WebKit/Source/devtools/front_end/audits2_worker.json
|
||||
+++ b/third_party/WebKit/Source/devtools/front_end/audits2_worker.json
|
||||
--- a/third_party/blink/renderer/devtools/front_end/audits2_worker.json
|
||||
+++ b/third_party/blink/renderer/devtools/front_end/audits2_worker.json
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"modules": [
|
||||
@@ -38,8 +28,8 @@
|
||||
+ { "name": "audits2_worker" }
|
||||
]
|
||||
}
|
||||
--- a/third_party/WebKit/Source/devtools/front_end/devtools_app.json
|
||||
+++ b/third_party/WebKit/Source/devtools/front_end/devtools_app.json
|
||||
--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
|
||||
+++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
|
||||
@@ -5,7 +5,7 @@
|
||||
{ "name": "mobile_throttling", "type": "autostart" },
|
||||
{ "name": "browser_components", "type": "autostart" },
|
||||
@@ -49,7 +39,7 @@
|
||||
{ "name": "animation" },
|
||||
{ "name": "audits2" },
|
||||
{ "name": "browser_console" },
|
||||
@@ -13,13 +13,13 @@
|
||||
@@ -13,14 +13,14 @@
|
||||
{ "name": "cookie_table" },
|
||||
{ "name": "devices" },
|
||||
{ "name": "elements" },
|
||||
@@ -60,13 +50,14 @@
|
||||
{ "name": "layers" },
|
||||
{ "name": "layer_viewer" },
|
||||
{ "name": "network" },
|
||||
{ "name": "performance_monitor" },
|
||||
- { "name": "product_registry_impl", "type": "remote" },
|
||||
+ { "name": "product_registry_impl" },
|
||||
{ "name": "resources" },
|
||||
{ "name": "security" },
|
||||
{ "name": "timeline" },
|
||||
--- a/third_party/WebKit/Source/devtools/front_end/shell.json
|
||||
+++ b/third_party/WebKit/Source/devtools/front_end/shell.json
|
||||
--- a/third_party/blink/renderer/devtools/front_end/shell.json
|
||||
+++ b/third_party/blink/renderer/devtools/front_end/shell.json
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
{ "name": "changes" },
|
||||
@@ -83,10 +74,10 @@
|
||||
- { "name": "terminal", "type": "remote" },
|
||||
+ { "name": "terminal" },
|
||||
{ "name": "text_editor" },
|
||||
{ "name": "workspace_diff" }
|
||||
]
|
||||
--- a/third_party/WebKit/Source/devtools/front_end/worker_app.json
|
||||
+++ b/third_party/WebKit/Source/devtools/front_end/worker_app.json
|
||||
{ "name": "workspace_diff" },
|
||||
{ "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
|
||||
@@ -12,7 +12,7 @@
|
||||
{ "name": "help" },
|
||||
{ "name": "layer_viewer" },
|
||||
|
||||
Reference in New Issue
Block a user