169 lines
7.6 KiB
Diff
169 lines
7.6 KiB
Diff
From: Your Name <you@example.com>
|
|
Date: Wed, 6 Sep 2023 17:55:01 +0000
|
|
Subject: Fix chromium build bugs
|
|
|
|
because of
|
|
https://bugs.chromium.org/p/chromium/issues/detail?id=1491776#c10
|
|
---
|
|
BUILD.gn | 1 -
|
|
.../chrome_browsing_data_model_delegate.cc | 1 +
|
|
.../navigation_predictor_metrics_document_data.h | 2 ++
|
|
chrome/browser/safe_browsing/BUILD.gn | 1 +
|
|
.../omnibox/browser/autocomplete_classifier.cc | 4 ++--
|
|
components/omnibox/browser/omnibox_field_trial.cc | 4 ++--
|
|
.../phishing_classifier/phishing_image_embedder.cc | 14 +++-----------
|
|
content/browser/browser_interface_binders.cc | 1 +
|
|
crypto/BUILD.gn | 3 +++
|
|
net/BUILD.gn | 1 +
|
|
third_party/libevent/BUILD.gn | 2 ++
|
|
11 files changed, 18 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -410,7 +410,6 @@ group("gn_all") {
|
|
"//android_webview:empty_group",
|
|
"//android_webview/test",
|
|
"//android_webview/tools/automated_ui_tests:webview_ui_test_app",
|
|
- "//android_webview/tools/captured_sites_tests:captured_sites_test_app",
|
|
"//android_webview/tools/sdk_sandbox",
|
|
"//android_webview/tools/system_webview_shell",
|
|
"//chrome/android:chrome_junit_tests",
|
|
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc
|
|
--- a/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc
|
|
+++ b/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc
|
|
@@ -262,6 +262,7 @@ bool ChromeBrowsingDataModelDelegate::IsCookieDeletionDisabled(
|
|
auto* client = permissions::PermissionsClient::Get();
|
|
return client->IsCookieDeletionDisabled(profile_, url);
|
|
}
|
|
+ return false;
|
|
#endif
|
|
return false;
|
|
}
|
|
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h b/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h
|
|
--- a/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h
|
|
+++ b/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h
|
|
@@ -69,6 +69,8 @@ class NavigationPredictorMetricsDocumentData
|
|
UserInteractionsData(const UserInteractionsData&);
|
|
UserInteractionsData& operator=(const UserInteractionsData&);
|
|
|
|
+ UserInteractionsData& operator=(UserInteractionsData&&) noexcept = default;
|
|
+
|
|
// True if the anchor element is still in viewport, otherwise false.
|
|
bool is_in_viewport = false;
|
|
// True if the pointer is still hovering over the anchor element,
|
|
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
|
|
--- a/chrome/browser/safe_browsing/BUILD.gn
|
|
+++ b/chrome/browser/safe_browsing/BUILD.gn
|
|
@@ -182,6 +182,7 @@ static_library("safe_browsing") {
|
|
"//components/version_info",
|
|
"//content/public/browser",
|
|
"//services/preferences/public/mojom:mojom",
|
|
+ "//third_party/flatbuffers:flatbuffers",
|
|
]
|
|
if (safe_browsing_mode == 1) {
|
|
# "Safe Browsing Full" files in addition to the "basic" ones to use for
|
|
diff --git a/components/omnibox/browser/autocomplete_classifier.cc b/components/omnibox/browser/autocomplete_classifier.cc
|
|
--- a/components/omnibox/browser/autocomplete_classifier.cc
|
|
+++ b/components/omnibox/browser/autocomplete_classifier.cc
|
|
@@ -97,8 +97,8 @@ void AutocompleteClassifier::Classify(
|
|
metrics::OmniboxEventProto::PageClassification page_classification,
|
|
AutocompleteMatch* match,
|
|
GURL* alternate_nav_url) {
|
|
- TRACE_EVENT1("omnibox", "AutocompleteClassifier::Classify", "text",
|
|
- base::UTF16ToUTF8(text));
|
|
+ // TRACE_EVENT1("omnibox", "AutocompleteClassifier::Classify", "text",
|
|
+ // base::UTF16ToUTF8(text));
|
|
DCHECK(!inside_classify_);
|
|
base::AutoReset<bool> reset(&inside_classify_, true);
|
|
AutocompleteInput input(text, page_classification, *scheme_classifier_);
|
|
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
|
|
--- a/components/omnibox/browser/omnibox_field_trial.cc
|
|
+++ b/components/omnibox/browser/omnibox_field_trial.cc
|
|
@@ -1083,11 +1083,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default;
|
|
|
|
ScopedMLConfigForTesting::ScopedMLConfigForTesting()
|
|
: original_config_(std::make_unique<MLConfig>(GetMLConfig())) {
|
|
- GetMLConfigInternal() = {};
|
|
+ //GetMLConfigInternal() = {};
|
|
}
|
|
|
|
ScopedMLConfigForTesting::~ScopedMLConfigForTesting() {
|
|
- GetMLConfigInternal() = *original_config_;
|
|
+ //GetMLConfigInternal() = *original_config_;
|
|
}
|
|
|
|
MLConfig& ScopedMLConfigForTesting::GetMLConfig() {
|
|
diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc b/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc
|
|
--- a/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc
|
|
+++ b/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc
|
|
@@ -52,17 +52,9 @@ void PhishingImageEmbedder::BeginImageEmbedding(DoneCallback done_callback) {
|
|
}
|
|
|
|
void PhishingImageEmbedder::OnPlaybackDone(std::unique_ptr<SkBitmap> bitmap) {
|
|
- if (bitmap) {
|
|
- bitmap_ = std::move(bitmap);
|
|
- ScorerStorage::GetInstance()
|
|
- ->GetScorer()
|
|
- ->ApplyVisualTfLiteModelImageEmbedding(
|
|
- *bitmap_,
|
|
- base::BindOnce(&PhishingImageEmbedder::OnImageEmbeddingDone,
|
|
- weak_factory_.GetWeakPtr()));
|
|
- } else {
|
|
- RunFailureCallback();
|
|
- }
|
|
+ // (UAZO) removed due error:
|
|
+ // no member named 'ApplyVisualTfLiteModelImageEmbedding' in 'safe_browsing::Scorer'
|
|
+ RunFailureCallback();
|
|
}
|
|
|
|
void PhishingImageEmbedder::CancelPendingImageEmbedding() {
|
|
diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc
|
|
--- a/content/browser/browser_interface_binders.cc
|
|
+++ b/content/browser/browser_interface_binders.cc
|
|
@@ -362,6 +362,7 @@ void BindDateTimeChooserForFrame(
|
|
void BindTextSuggestionHostForFrame(
|
|
RenderFrameHost* host,
|
|
mojo::PendingReceiver<blink::mojom::TextSuggestionHost> receiver) {
|
|
+ if ((true)) return;
|
|
auto* view =
|
|
RenderWidgetHostViewAndroid::FromRenderWidgetHostView(host->GetView());
|
|
if (!view || !view->text_suggestion_host())
|
|
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
|
|
--- a/crypto/BUILD.gn
|
|
+++ b/crypto/BUILD.gn
|
|
@@ -14,6 +14,9 @@ buildflag_header("buildflags") {
|
|
}
|
|
|
|
component("crypto") {
|
|
+ # fix error
|
|
+ # [chromium-rawptr] Use raw_ptr<T> instead of a raw pointer.
|
|
+ configs -= [ "//build/config/clang:find_bad_constructs" ]
|
|
output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto.
|
|
sources = [
|
|
"aead.cc",
|
|
diff --git a/net/BUILD.gn b/net/BUILD.gn
|
|
--- a/net/BUILD.gn
|
|
+++ b/net/BUILD.gn
|
|
@@ -1584,6 +1584,7 @@ component("net") {
|
|
configs -= [ "//build/config/compiler:default_optimization" ]
|
|
configs += [ "//build/config/compiler:optimize_max" ]
|
|
}
|
|
+ configs -= [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
# net_export.h has its own build target so that code (eg
|
|
diff --git a/third_party/libevent/BUILD.gn b/third_party/libevent/BUILD.gn
|
|
--- a/third_party/libevent/BUILD.gn
|
|
+++ b/third_party/libevent/BUILD.gn
|
|
@@ -58,6 +58,8 @@ static_library("libevent") {
|
|
configs += [ "//build/config/compiler:optimize_max" ]
|
|
}
|
|
|
|
+ configs -= [ "//build/config/clang:find_bad_constructs" ]
|
|
+
|
|
configs -= [ "//build/config/compiler:chromium_code" ]
|
|
configs += [ "//build/config/compiler:no_chromium_code" ]
|
|
}
|
|
--
|