PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
create-pull-request/patch-cdf415c
cromite/build/patches/Fix-chromium-build-bugs.patch
T

156 lines
7.2 KiB
Diff
Raw Permalink Blame History

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 -
.../navigation_predictor_metrics_document_data.h | 2 ++
chrome/browser/safe_browsing/BUILD.gn | 1 +
.../installer_policies/BUILD.gn | 1 +
components/contextual_tasks/internal/BUILD.gn | 1 +
.../omnibox/browser/autocomplete_classifier.cc | 4 ++--
.../omnibox/browser/omnibox_field_trial.cc | 4 ++--
.../phishing_image_embedder.cc | 16 +++-------------
content/browser/browser_interface_binders.cc | 1 +
services/webnn/dml/graph_impl_dml.cc | 1 +
10 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -409,7 +409,6 @@ group("gn_all") {
"//android_webview:empty_group",
"//android_webview/test",
"//android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk",
- "//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/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
@@ -75,6 +75,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
@@ -326,6 +326,7 @@ static_library("safe_browsing") {
"//components/version_info",
"//content/public/browser",
"//services/preferences/public/mojom",
+ "//third_party/flatbuffers:flatbuffers",
]
public_deps += [ "//chrome/browser/security_events" ]
diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -49,6 +49,7 @@ static_library("installer_policies_no_content_deps") {
"//components/update_client",
"//mojo/public/cpp/base:protobuf_support",
"//services/network/public/cpp",
+ "//third_party/re2",
]
# Disallow depending on content.
diff --git a/components/contextual_tasks/internal/BUILD.gn b/components/contextual_tasks/internal/BUILD.gn
--- a/components/contextual_tasks/internal/BUILD.gn
+++ b/components/contextual_tasks/internal/BUILD.gn
@@ -53,6 +53,7 @@ source_set("internal") {
"//net",
"//ui/gfx",
"//url",
+ "//third_party/re2",
]
}
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
@@ -132,8 +132,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
@@ -803,11 +803,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
@@ -56,19 +56,9 @@ void PhishingImageEmbedder::BeginImageEmbedding(
void PhishingImageEmbedder::OnPlaybackDone(bool can_extract_visual_features,
std::unique_ptr<SkBitmap> bitmap) {
- if (bitmap) {
- bitmap_ = std::move(bitmap);
-
- ScorerStorage::GetInstance()
- ->GetScorer()
- ->ApplyVisualTfLiteModelImageEmbedding(
- *bitmap_,
- base::BindOnce(&PhishingImageEmbedder::OnImageEmbeddingDone,
- weak_factory_.GetWeakPtr(),
- can_extract_visual_features));
- } 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
@@ -372,6 +372,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/services/webnn/dml/graph_impl_dml.cc b/services/webnn/dml/graph_impl_dml.cc
--- a/services/webnn/dml/graph_impl_dml.cc
+++ b/services/webnn/dml/graph_impl_dml.cc
@@ -241,6 +241,7 @@ base::expected<void, mojom::ErrorPtr> CreateUnexpectedError(
// Calculate the total byte length of buffers and the D3D12_RANGE for each
// buffer, all with the required alignment.
+[[maybe_unused]]
std::optional<AlignedByteLength<OperandId>> CalculateAlignedByteLength(
const base::flat_map<OperandId, std::unique_ptr<WebNNConstantOperand>>&
constant_operands) {
--
Reference in New Issue View Git Blame Copy Permalink