[Bringup] Fix OffScreenRenderWidgetHostView related linking error 42/142842/1
authorYoungsoo Choi <kenshin.choi@samsung.com>
Sun, 6 Aug 2017 04:27:34 +0000 (04:27 +0000)
committerYoungsoo Choi <kenshin.choi@samsung.com>
Mon, 7 Aug 2017 08:42:03 +0000 (08:42 +0000)
The DelegatedFrameHost is not used in chromium-efl.

>> undefined reference to `content::DelegatedFrameHost::WasHidden()'
>> undefined reference to `content::DelegatedFrameHost::ResetCompositor()'

Change-Id: Ibd5631c41153b35bcb8674db48fd57ca1cb2f8ce
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>
atom/browser/osr/osr_render_widget_host_view.cc

index 2003118..b54f4e7 100644 (file)
@@ -105,7 +105,11 @@ class AtomCopyFrameGenerator {
             damage_rect));
 
     request->set_area(gfx::Rect(view_->GetPhysicalBackingSize()));
+#if defined(USE_EFL)
+    NOTIMPLEMENTED();
+#else
     view_->GetRootLayer()->RequestCopyOfOutput(std::move(request));
+#endif
   }
 
   void CopyFromCompositingSurfaceHasResult(
@@ -151,6 +155,9 @@ class AtomCopyFrameGenerator {
         return;
     }
 
+#if defined(USE_EFL)
+    NOTIMPLEMENTED();
+#else
     content::ImageTransportFactory* factory =
         content::ImageTransportFactory::GetInstance();
     display_compositor::GLHelper* gl_helper = factory->GetGLHelper();
@@ -186,6 +193,7 @@ class AtomCopyFrameGenerator {
             base::Passed(&bitmap_),
             base::Passed(&bitmap_pixels_lock)),
         display_compositor::GLHelper::SCALER_QUALITY_FAST);
+#endif
   }
 
   static void CopyFromCompositingSurfaceFinishedProxy(
@@ -196,12 +204,16 @@ class AtomCopyFrameGenerator {
       std::unique_ptr<SkAutoLockPixels> bitmap_pixels_lock,
       bool result) {
     gpu::SyncToken sync_token;
+#if defined(USE_EFL)
+    NOTIMPLEMENTED();
+#else
     if (result) {
       display_compositor::GLHelper* gl_helper =
           content::ImageTransportFactory::GetInstance()->GetGLHelper();
       if (gl_helper)
         gl_helper->GenerateSyncToken(&sync_token);
     }
+#endif
     const bool lost_resource = !sync_token.HasData();
     release_callback->Run(sync_token, lost_resource);
 
@@ -363,7 +375,9 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
   root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
 #endif
 
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
   CreatePlatformWidget();
 #else
   compositor_.reset(
@@ -769,7 +783,9 @@ std::unique_ptr<cc::SoftwareOutputDevice>
 bool OffScreenRenderWidgetHostView::InstallTransparency() {
   if (transparent_) {
     SetBackgroundColor(SkColor());
-#if defined(OS_MACOSX)
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#elif defined(OS_MACOSX)
     browser_compositor_->SetHasTransparentBackground(true);
 #else
     compositor_->SetHostHasTransparentBackground(true);
@@ -848,8 +864,12 @@ void OffScreenRenderWidgetHostView::SetupFrameRate(bool force) {
 
   frame_rate_threshold_ms_ = 1000 / frame_rate_;
 
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetCompositor()->vsync_manager()->SetAuthoritativeVSyncInterval(
       base::TimeDelta::FromMilliseconds(frame_rate_threshold_ms_));
+#endif
 
   if (copy_frame_generator_) {
     copy_frame_generator_->set_frame_rate_threshold_ms(
@@ -890,8 +910,12 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer() {
   const gfx::Size& size_in_pixels =
       gfx::ConvertSizeToPixel(scale_factor_, size);
 
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   GetRootLayer()->SetBounds(gfx::Rect(size));
   GetCompositor()->SetScaleAndSize(scale_factor_, size_in_pixels);
+#endif
 }
 
 void OffScreenRenderWidgetHostView::OnWindowResize() {