[M85 Dev][EFL] Fix for white screen on launch

Below change fixes white screen issue on launch
on efl port and google.com renders fine.

Change-Id: I5da0e18d5c429c8246b5f9a46fe58f26b099b0b6
Signed-off-by: uzair <uzair.jaleel@samsung.com>

diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink.cc b/cc/mojo_embedder/async_layer_tree_frame_sink.cc
index b37945a..b534bbb 100644 (file)
--- a/cc/mojo_embedder/async_layer_tree_frame_sink.cc
+++ b/cc/mojo_embedder/async_layer_tree_frame_sink.cc
@@ -174,6 +174,11 @@ void AsyncLayerTreeFrameSink::SubmitCompositorFrame(
     pipeline_reporting_frame_times_.erase(it);
   }
 
+#if defined(USE_EFL)
+  local_surface_id_ = viz::LocalSurfaceId(viz::kInitialParentSequenceNumber,
+                                          viz::kInitialChildSequenceNumber,
+                                          base::UnguessableToken::Create());
+#else
   if (local_surface_id_ == last_submitted_local_surface_id_) {
     DCHECK_EQ(last_submitted_device_scale_factor_, frame.device_scale_factor());
     DCHECK_EQ(last_submitted_size_in_pixels_.height(),
@@ -181,7 +186,7 @@ void AsyncLayerTreeFrameSink::SubmitCompositorFrame(
     DCHECK_EQ(last_submitted_size_in_pixels_.width(),
               frame.size_in_pixels().width());
   }
-
+#endif
   base::Optional<viz::HitTestRegionList> hit_test_region_list =
       client_->BuildHitTestData();
 

diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index d5e57ea..98e8eec 100644 (file)
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -471,9 +471,13 @@ void LayerTreeHost::WillCommit() {
 }
 
 void LayerTreeHost::UpdateDeferMainFrameUpdateInternal() {
+#if defined(USE_EFL)
+  proxy_->SetDeferMainFrameUpdate(defer_main_frame_update_count_ > 0);
+#else
   proxy_->SetDeferMainFrameUpdate(
       defer_main_frame_update_count_ > 0 ||
       !local_surface_id_allocation_from_parent_.IsValid());
+#endif
 }
 
 bool LayerTreeHost::IsUsingLayerLists() const {

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 87a2742..08406b3 100644 (file)
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -130,6 +130,10 @@
 #include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/skia_util.h"
 
+#if defined(USE_EFL)
+#include "base/time/time.h"
+#endif
+
 namespace cc {
 namespace {
 
@@ -2218,9 +2222,13 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() {
         browser_controls_offset_manager_->TopControlsShownRatio());
   }
 
+#if defined(USE_EFL)
+  metadata.local_surface_id_allocation_time = base::TimeTicks::Now();
+#else
   metadata.local_surface_id_allocation_time =
       child_local_surface_id_allocator_.GetCurrentLocalSurfaceIdAllocation()
           .allocation_time();
+#endif
 
   if (InnerViewportScrollNode()) {
     // TODO(miletus) : Change the metadata to hold ScrollOffset.

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
index 516c5cd..6d7fa13 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
@@ -90,8 +90,6 @@ RenderWidgetHostViewBase* WebContentsViewEfl::CreateViewForWidget(
       new RenderWidgetHostViewEfl(render_widget_host, *web_contents_);
   view->InitAsChild(nullptr);
   view->SetTouchEventsEnabled(touch_enabled_);
-  view->Show();
-
   SetOrientation(orientation_);
 
   RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();