[M71 Dev][EFL] Fix linker errors for desktop build

This resolves linker errors to enable EFL port.

Change-Id: Iedf872c27420885f2e466ef4b9845c5eea28ceac
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 72532e7..a87a401 100644 (file)
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -1965,7 +1965,7 @@ jumbo_source_set("browser") {
 
   # Desktop/Window/WebContents screen capture implementations, conditionally
   # built depending on the available implementations for each platform.
-  if (is_linux || is_mac || is_win || is_tizen) {
+  if (is_mac || is_win || is_tizen) {
     defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
     sources += [
       "media/capture/desktop_capture_device.cc",

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 8fb541d..303c925 100644 (file)
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3162,11 +3162,11 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     renderer_cmd->AppendSwitch(switches::kDisableDatabases);
   }
 
-#if defined(OS_ANDROID) && !defined(USE_EFL)
+#if defined(OS_ANDROID)
   if (browser_cmd.HasSwitch(switches::kDisableGpuCompositing)) {
     renderer_cmd->AppendSwitch(switches::kDisableGpuCompositing);
   }
-#elif !defined(OS_CHROMEOS)
+#elif !defined(OS_CHROMEOS) && !defined(USE_EFL)
 #if !BUILDFLAG(ENABLE_MUS)
   // If gpu compositing is not being used, tell the renderer at startup. This
   // is inherently racey, as it may change while the renderer is being launched,

diff --git a/content/browser/scheduler/responsiveness/native_event_observer.cc b/content/browser/scheduler/responsiveness/native_event_observer.cc
index 0aa5e6e..8348a78 100644 (file)
--- a/content/browser/scheduler/responsiveness/native_event_observer.cc
+++ b/content/browser/scheduler/responsiveness/native_event_observer.cc
@@ -17,7 +17,7 @@
 
 #include "ui/events/platform/platform_event_source.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_EFL)
 #include "ui/aura/env.h"
 #include "ui/events/event.h"
 #endif
@@ -64,7 +64,7 @@ NativeEventObserver::~NativeEventObserver() {
   DeregisterObserver();
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_EFL)
 void NativeEventObserver::RegisterObserver() {
   aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this);
 }
@@ -127,7 +127,7 @@ void NativeEventObserver::DidDispatchMSG(const MSG& msg) {
 }
 #endif  // defined(OS_WIN)
 
-#if defined(OS_ANDROID) || defined(OS_FUCHSIA)
+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(USE_EFL)
 void NativeEventObserver::RegisterObserver() {}
 void NativeEventObserver::DeregisterObserver() {}
 #endif  // defined(OS_ANDROID) || defined(OS_FUCHSIA)

diff --git a/content/browser/scheduler/responsiveness/native_event_observer.h b/content/browser/scheduler/responsiveness/native_event_observer.h
index cf2ef28..9d49e0e 100644 (file)
--- a/content/browser/scheduler/responsiveness/native_event_observer.h
+++ b/content/browser/scheduler/responsiveness/native_event_observer.h
@@ -15,7 +15,7 @@
 #include "content/public/browser/native_event_processor_observer_mac.h"
 #endif
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_EFL)
 #include "ui/aura/window_event_dispatcher_observer.h"
 #endif
 
@@ -40,7 +40,7 @@ namespace responsiveness {
 class CONTENT_EXPORT NativeEventObserver
 #if defined(OS_MACOSX)
     : public NativeEventProcessorObserver
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) && !defined(USE_EFL)
     : public aura::WindowEventDispatcherObserver
 #elif defined(OS_WIN)
     : public base::MessagePumpForUI::Observer
@@ -60,7 +60,7 @@ class CONTENT_EXPORT NativeEventObserver
   NativeEventObserver(WillRunEventCallback will_run_event_callback,
                       DidRunEventCallback did_run_event_callback);
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_EFL)
   ~NativeEventObserver() override;
 #else
   virtual ~NativeEventObserver();
@@ -73,7 +73,7 @@ class CONTENT_EXPORT NativeEventObserver
   void WillRunNativeEvent(const void* opaque_identifier) override;
   void DidRunNativeEvent(const void* opaque_identifier,
                          base::TimeTicks creation_time) override;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) && !defined(USE_EFL)
   // aura::WindowEventDispatcherObserver overrides:
   void OnWindowEventDispatcherStartedProcessing(
       aura::WindowEventDispatcher* dispatcher,

diff --git a/services/network/network_service.cc b/services/network/network_service.cc
index 893d8f7..8274f11 100644 (file)
--- a/services/network/network_service.cc
+++ b/services/network/network_service.cc
@@ -445,6 +445,10 @@ void NetworkService::UpdateSignedTreeHead(const net::ct::SignedTreeHead& sth) {
   sth_distributor_->NewSTHObserved(sth);
 }
 
+void NetworkService::UpdateCRLSet(base::span<const uint8_t> crl_set) {
+  crl_set_distributor_->OnNewCRLSet(crl_set);
+}
+
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_EFL)
 void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) {
 #if !defined(IS_CHROMECAST)