[Bringup] Fix DelegatedFrameHost related linking error

The DelegatedFrameHost needs to be handled in EFL port.

>> undefined reference to `content::DelegatedFrameHost::*'

Change-Id: I5a286d8a0bec110548184ebdb11695a05141d1a2
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc
index b54f4e7..dda58b0 100644 (file)
--- a/atom/browser/osr/osr_render_widget_host_view.cc
+++ b/atom/browser/osr/osr_render_widget_host_view.cc
@@ -366,7 +366,9 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
   DCHECK(render_widget_host_);
   render_widget_host_->SetView(this);
 
-#if !defined(OS_MACOSX)
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#elif !defined(OS_MACOSX)
   content::ImageTransportFactory* factory =
       content::ImageTransportFactory::GetInstance();
   delegated_frame_host_ = base::MakeUnique<content::DelegatedFrameHost>(
@@ -397,7 +399,9 @@ OffScreenRenderWidgetHostView::~OffScreenRenderWidgetHostView() {
   if (native_window_)
     native_window_->RemoveObserver(this);
 
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
   if (is_showing_)
     browser_compositor_->SetRenderWidgetHostIsHidden(true);
 #else
@@ -464,7 +468,11 @@ void OffScreenRenderWidgetHostView::SetSize(const gfx::Size& size) {
   ResizeRootLayer();
   if (render_widget_host_)
     render_widget_host_->WasResized();
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetDelegatedFrameHost()->WasResized();
+#endif
 }
 
 void OffScreenRenderWidgetHostView::SetBounds(const gfx::Rect& new_bounds) {
@@ -495,7 +503,12 @@ bool OffScreenRenderWidgetHostView::HasFocus() const {
 }
 
 bool OffScreenRenderWidgetHostView::IsSurfaceAvailableForCopy() const {
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+  return false;
+#else
   return GetDelegatedFrameHost()->CanCopyToBitmap();
+#endif
 }
 
 void OffScreenRenderWidgetHostView::Show() {
@@ -504,7 +517,9 @@ void OffScreenRenderWidgetHostView::Show() {
 
   is_showing_ = true;
 
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
   browser_compositor_->SetRenderWidgetHostIsHidden(false);
 #else
   delegated_frame_host_->SetCompositor(compositor_.get());
@@ -522,7 +537,9 @@ void OffScreenRenderWidgetHostView::Hide() {
   if (render_widget_host_)
     render_widget_host_->WasHidden();
 
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
   browser_compositor_->SetRenderWidgetHostIsHidden(true);
 #else
   GetDelegatedFrameHost()->WasHidden();
@@ -583,7 +600,9 @@ void OffScreenRenderWidgetHostView::OnSwapCompositorFrame(
 
       // The compositor will draw directly to the SoftwareOutputDevice which
       // then calls OnPaint.
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+      NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
       browser_compositor_->SwapCompositorFrame(output_surface_id,
                                                std::move(frame));
 #else
@@ -605,7 +624,9 @@ void OffScreenRenderWidgetHostView::OnSwapCompositorFrame(
           gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
       damage_rect.Intersect(gfx::Rect(frame_size));
 
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+      NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
       browser_compositor_->SwapCompositorFrame(output_surface_id,
                                                std::move(frame));
 #else
@@ -621,7 +642,11 @@ void OffScreenRenderWidgetHostView::OnSwapCompositorFrame(
 }
 
 void OffScreenRenderWidgetHostView::ClearCompositorFrame() {
+#if defined(USE_EFL)
+      NOTIMPLEMENTED();
+#else
   GetDelegatedFrameHost()->ClearDelegatedFrame();
+#endif
 }
 
 void OffScreenRenderWidgetHostView::InitAsPopup(
@@ -666,29 +691,50 @@ void OffScreenRenderWidgetHostView::CopyFromCompositingSurface(
     const gfx::Size& dst_size,
     const content::ReadbackRequestCallback& callback,
     const SkColorType preferred_color_type) {
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetDelegatedFrameHost()->CopyFromCompositingSurface(
     src_subrect, dst_size, callback, preferred_color_type);
+#endif
 }
 
 void OffScreenRenderWidgetHostView::CopyFromCompositingSurfaceToVideoFrame(
     const gfx::Rect& src_subrect,
     const scoped_refptr<media::VideoFrame>& target,
     const base::Callback<void(const gfx::Rect&, bool)>& callback) {
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetDelegatedFrameHost()->CopyFromCompositingSurfaceToVideoFrame(
     src_subrect, target, callback);
+#endif
 }
 
 bool OffScreenRenderWidgetHostView::CanCopyToVideoFrame() const {
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+  return false;
+#else
   return GetDelegatedFrameHost()->CanCopyToVideoFrame();
+#endif
 }
 
 void OffScreenRenderWidgetHostView::BeginFrameSubscription(
   std::unique_ptr<content::RenderWidgetHostViewFrameSubscriber> subscriber) {
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetDelegatedFrameHost()->BeginFrameSubscription(std::move(subscriber));
+#endif
 }
 
 void OffScreenRenderWidgetHostView::EndFrameSubscription() {
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetDelegatedFrameHost()->EndFrameSubscription();
+#endif
 }
 
 bool OffScreenRenderWidgetHostView::HasAcceleratedSurface(const gfx::Size &) {
@@ -852,11 +898,13 @@ ui::Layer* OffScreenRenderWidgetHostView::GetRootLayer() const {
   return root_layer_.get();
 }
 
+#if !defined(USE_EFL)
 content::DelegatedFrameHost*
 OffScreenRenderWidgetHostView::GetDelegatedFrameHost() const {
   return delegated_frame_host_.get();
 }
 #endif
+#endif
 
 void OffScreenRenderWidgetHostView::SetupFrameRate(bool force) {
   if (!force && frame_rate_threshold_ms_ != 0)

diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h
index 7380476..224b6d4 100644 (file)
--- a/atom/browser/osr/osr_render_widget_host_view.h
+++ b/atom/browser/osr/osr_render_widget_host_view.h
@@ -196,7 +196,10 @@ class OffScreenRenderWidgetHostView
 
   ui::Compositor* GetCompositor() const;
   ui::Layer* GetRootLayer() const;
+  // TODO: Enable DelegatedFrameHost for EFL port
+#if !defined(USE_EFL)
   content::DelegatedFrameHost* GetDelegatedFrameHost() const;
+#endif
 
   void Invalidate();
 
@@ -231,7 +234,10 @@ class OffScreenRenderWidgetHostView
 
   std::unique_ptr<ui::Layer> root_layer_;
   std::unique_ptr<ui::Compositor> compositor_;
+  // TODO: Enable DelegatedFrameHost for EFL port
+#if !defined(USE_EFL)
   std::unique_ptr<content::DelegatedFrameHost> delegated_frame_host_;
+#endif
 
   std::unique_ptr<AtomCopyFrameGenerator> copy_frame_generator_;
   std::unique_ptr<AtomBeginFrameTimer> begin_frame_timer_;