[M126][EFL][Onscreen] Fix build errors for desktop profile for Chrome

This commit fixes all gn related, compilation and linker errors
for desktop build.

Basic rendering works fine and google.com loads as expected on desktop.

Change-Id: I6f762d7e34aca908ee1e88cc5e39afa88801e5d7
Signed-off-by: nishitha <n.saravanan@samsung.com>

diff --git a/base/containers/span_rust.h b/base/containers/span_rust.h
index 8deaa29dbc7a13fb0bd75e8341c4428c7e2e2dc6..7ace88c4539409d93c11bc8aeadb193c067fcaae 100644 (file)
--- a/base/containers/span_rust.h
+++ b/base/containers/span_rust.h
@@ -11,7 +11,7 @@
 #include "base/rust_buildflags.h"
 #include "third_party/rust/cxx/v1/cxx.h"
 
-#if !BUILDFLAG(BUILD_RUST_BASE_CONVERSIONS)
+#if !BUILDFLAG(BUILD_RUST_BASE_CONVERSIONS) && !defined(EWK_BRINGUP) //FIXME:m126 bringup
 #error "span_rust.h included without BUILD_RUST_BASE_CONVERSIONS"
 #endif
 

diff --git a/chrome/browser/ui/location_bar/location_bar.h b/chrome/browser/ui/location_bar/location_bar.h
index 307a5c9cda2dc09d57db5b80675b97791bfeb4d4..3d6bd0f15bc900bd1e47eb2d9f8b9d052c52caac 100644 (file)
--- a/chrome/browser/ui/location_bar/location_bar.h
+++ b/chrome/browser/ui/location_bar/location_bar.h
@@ -47,13 +47,15 @@ class LocationBar {
                      ui::PageTransition transition,
                      base::TimeTicks match_selection_timestamp,
                      bool url_typed_without_scheme,
-                     bool url_typed_with_http_scheme)
+                     bool url_typed_with_http_scheme,
+                     std::string_view extra_headers)
         : destination_url(destination_url),
           disposition(disposition),
           transition(transition),
           match_selection_timestamp(match_selection_timestamp),
           url_typed_without_scheme(url_typed_without_scheme),
-          url_typed_with_http_scheme(url_typed_with_http_scheme) {}
+          url_typed_with_http_scheme(url_typed_with_http_scheme),
+          extra_headers(extra_headers) {}
   };
 
   explicit LocationBar(CommandUpdater* command_updater)

diff --git a/chrome/browser/ui/safety_hub/menu_notification_service.h b/chrome/browser/ui/safety_hub/menu_notification_service.h
index 803f9e5c7cc9a6ee753d7fe56fd88916c9c898ee..443dc0a7fcf44d3ad42c0ea1a84e9a1f8a594ac0 100644 (file)
--- a/chrome/browser/ui/safety_hub/menu_notification_service.h
+++ b/chrome/browser/ui/safety_hub/menu_notification_service.h
@@ -24,8 +24,8 @@ struct MenuNotificationEntry {
   int command = 0;
   std::u16string label;
   safety_hub::SafetyHubModuleType module;
-  MenuNotificationEntry(int command, std::u16string label)
-      : command(command), label(label) {}
+  MenuNotificationEntry(int command, std::u16string label, safety_hub::SafetyHubModuleType module)
+      : command(command), label(label), module(module) {}
 };
 
 namespace {

diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h b/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h
index 7d999010d482ac73bc20364ca1d2aa46fe8e7dc8..be350ffdf372509e93012d49dcff05b441945875 100644 (file)
--- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h
+++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h
@@ -97,10 +97,6 @@ class EmbeddedPermissionPromptBaseView : public PermissionPromptBaseView {
     ButtonType type;
     ui::ButtonStyle style;
     ui::ElementIdentifier identifier;
-    ButtonConfiguration(std::u16string label,
-                        ButtonType type,
-                        ui::ButtonStyle style)
-        : label(label), type(type), style(style) {}
   };
 
   static int GetViewId(ButtonType button) { return static_cast<int>(button); }

diff --git a/components/qr_code_generator/qr_code_generator.cc b/components/qr_code_generator/qr_code_generator.cc
index 86e97e100bc941f095c924393899043c32d39c04..1685f34b3182dc6c8566290b0cc67c16268f3eb9 100644 (file)
--- a/components/qr_code_generator/qr_code_generator.cc
+++ b/components/qr_code_generator/qr_code_generator.cc
@@ -10,7 +10,9 @@
 #include "base/check_op.h"
 #include "base/containers/span_rust.h"
 #include "base/numerics/safe_conversions.h"
+#if !BUILDFLAG(IS_EFL)
 #include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
+#endif
 
 namespace qr_code_generator {
 
@@ -22,6 +24,9 @@ GeneratedCode& GeneratedCode::operator=(GeneratedCode&&) = default;
 base::expected<GeneratedCode, Error> GenerateCode(
     base::span<const uint8_t> in,
     std::optional<int> min_version) {
+#if BUILDFLAG(IS_EFL)
+  return base::unexpected(Error::kUnknownError);
+#else
   rust::Slice<const uint8_t> rs_in = base::SpanToRustSlice(in);
 
   // `min_version` might come from a fuzzer and therefore we use a lenient
@@ -43,6 +48,7 @@ base::expected<GeneratedCode, Error> GenerateCode(
   code.qr_size = base::checked_cast<int>(result_width);
   CHECK_EQ(code.data.size(), static_cast<size_t>(code.qr_size * code.qr_size));
   return code;
+#endif
 }
 
 }  // namespace qr_code_generator

diff --git a/net/cert/mock_cert_verifier.cc b/net/cert/mock_cert_verifier.cc
index f21caf652e236ffffc7512769fccabe845c655b2..0605752de78f5ae72d309f2e844234ea106e72e8 100644 (file)
--- a/net/cert/mock_cert_verifier.cc
+++ b/net/cert/mock_cert_verifier.cc
@@ -22,7 +22,7 @@
 #include "net/cert/x509_certificate.h"
 
 namespace net {
-
+#if !defined(BUILD_CHROME)
 namespace {
 // Helper function for setting the appropriate CertStatus given a net::Error.
 CertStatus MapNetErrorToCertStatus(int error) {
@@ -64,7 +64,7 @@ CertStatus MapNetErrorToCertStatus(int error) {
   }
 }
 }  // namespace
-
+#endif
 struct MockCertVerifier::Rule {
   Rule(scoped_refptr<X509Certificate> cert_arg,
        const std::string& hostname_arg,

diff --git a/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp b/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp
index a5a65bbb1585d9d4bc858b919ec355ccc32d6b8d..b777bf04b179551dc7f0f1243499139968291540 100644 (file)
--- a/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -512,7 +512,7 @@ void CPDF_RenderStatus::ProcessClipPath(const CPDF_ClipPath& ClipPath,
     } else {
       m_pDevice->SetClip_PathFill(
           *pPath, &mtObj2Device,
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#if !defined(EWK_BRINGUP) || defined(BUILD_CHROME)  // FIXME: m120 bringup
           CFX_FillRenderOptions(ClipPath.GetClipType(i)));
 #else
           {.fill_type = ClipPath.GetClipType(i)});

diff --git a/ui/gl/features.gni b/ui/gl/features.gni
index 18e80764f8040c649010d20b0c32927f4806b50b..e2feb11a6e1bec460c8960de5da5def37969416e 100644 (file)
--- a/ui/gl/features.gni
+++ b/ui/gl/features.gni
@@ -25,8 +25,7 @@ declare_args() {
   # Should Dawn test binaries (unittests, end2end_tests, perf_tests) be built?
   # Independent of use_dawn, which controls whether Dawn is used in Chromium.
   build_dawn_tests = is_mac || is_win || is_linux || is_chromeos || is_android
-
-  enable_validating_command_decoder = is_android
+  enable_validating_command_decoder = is_android || use_efl
 }
 
 declare_args() {