fixup! Create AggregatedRenderPassList from CompositorRenderPassList

CSS filters were not getting applied due to missing
AggregatedRenderPassDrawQuad in AggregatedRenderPass.

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

diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
index cd34f2d0470f6b505bdca53a79e572741fa75e4c..3960b7f9beec26758a15113ec9f65be6a5de8d0c 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
@@ -61,7 +61,7 @@ void EvasGLDelegatedFrameHost::CreateAggregatedRenderPassList(
     auto copy_pass =
         std::make_unique<viz::AggregatedRenderPass>(sqs_size, dq_size);
     copy_pass->SetAll(
-        render_pass_id_generator_.GenerateNextId(), source->output_rect,
+        viz::AggregatedRenderPassId(uint64_t{source->id}), source->output_rect,
         source->damage_rect, source->transform_to_root_target, source->filters,
         source->backdrop_filters, source->backdrop_filter_bounds,
         gfx::ContentColorUsage::kSRGB, source->has_transparent_background,
@@ -87,8 +87,14 @@ void EvasGLDelegatedFrameHost::CreateAggregatedRenderPassList(
         *copy_shared_quad_state = **sqs_iter;
       }
       DCHECK(quad->shared_quad_state == *sqs_iter);
-
-      copy_pass->CopyFromAndAppendDrawQuad(quad);
+      if (quad->material == viz::DrawQuad::Material::kCompositorRenderPass) {
+        const auto* pass_quad =
+            viz::CompositorRenderPassDrawQuad::MaterialCast(quad);
+        copy_pass->CopyFromAndAppendRenderPassDrawQuad(
+            pass_quad,
+            viz::AggregatedRenderPassId(uint64_t{pass_quad->render_pass_id}));
+      } else
+        copy_pass->CopyFromAndAppendDrawQuad(quad);
     }
     render_pass_list_.push_back(std::move(copy_pass));
   }

diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h
index 0cdd16db9d0fedbe5525af4b862d18760f7c5d37..a25430c00b6aeaffd416895a08405e8a428fd99f 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h
@@ -67,7 +67,6 @@ class CONTENT_EXPORT EvasGLDelegatedFrameHost
   viz::DebugRendererSettings debug_settings_;
   std::unique_ptr<viz::DisplayResourceProvider> resource_provider_;
   int child_id_;
-  viz::AggregatedRenderPassId::Generator render_pass_id_generator_;
   viz::AggregatedRenderPassList render_pass_list_;
   viz::ResourceIdSet resources_in_frame_;
   std::vector<viz::ReturnedResource> returned_resources_;