From 9e40f3e2d3e52a528dae25af372942f4fbccd4c2 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Thu, 29 Mar 2018 21:49:35 -0700 Subject: [PATCH] Port flutter content handler to FIDL2. (flutter/engine#4903) --- engine/src/flutter/flow/BUILD.gn | 2 +- engine/src/flutter/flow/export_node.cc | 4 ++-- engine/src/flutter/flow/layers/layer.h | 2 +- engine/src/flutter/flow/layers/layer_tree.cc | 4 ++-- engine/src/flutter/flow/layers/layer_tree.h | 6 +++--- engine/src/flutter/flow/raster_cache.cc | 4 ++-- engine/src/flutter/flow/raster_cache.h | 4 ++-- engine/src/flutter/flow/scene_update_context.h | 7 ++++--- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/engine/src/flutter/flow/BUILD.gn b/engine/src/flutter/flow/BUILD.gn index 47c7316edf..e6a6411a6c 100644 --- a/engine/src/flutter/flow/BUILD.gn +++ b/engine/src/flutter/flow/BUILD.gn @@ -83,7 +83,7 @@ source_set("flow") { "scene_update_context.h", ] - deps += [ + public_deps += [ "//garnet/public/lib/ui/scenic:client", "//garnet/public/lib/ui/scenic/fidl", "//topaz/public/dart-pkg/zircon", diff --git a/engine/src/flutter/flow/export_node.cc b/engine/src/flutter/flow/export_node.cc index b6ce18ba7c..a130c426a7 100644 --- a/engine/src/flutter/flow/export_node.cc +++ b/engine/src/flutter/flow/export_node.cc @@ -61,8 +61,8 @@ void ExportNode::Bind(SceneUpdateContext& context, container.AddChild(*node_); node_->SetTranslation(offset.x(), offset.y(), 0.f); node_->SetHitTestBehavior(hit_testable - ? ui::gfx::HitTestBehavior::kDefault - : ui::gfx::HitTestBehavior::kSuppress); + ? gfx::HitTestBehavior::kDefault + : gfx::HitTestBehavior::kSuppress); } } diff --git a/engine/src/flutter/flow/layers/layer.h b/engine/src/flutter/flow/layers/layer.h index 09b82dddb0..d0ef1990ab 100644 --- a/engine/src/flutter/flow/layers/layer.h +++ b/engine/src/flutter/flow/layers/layer.h @@ -45,7 +45,7 @@ class Layer { struct PrerollContext { #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics = nullptr; + gfx::Metrics* metrics = nullptr; #endif RasterCache* raster_cache; GrContext* gr_context; diff --git a/engine/src/flutter/flow/layers/layer_tree.cc b/engine/src/flutter/flow/layers/layer_tree.cc index 9a52cb57d7..fde2fc4bf0 100644 --- a/engine/src/flutter/flow/layers/layer_tree.cc +++ b/engine/src/flutter/flow/layers/layer_tree.cc @@ -19,7 +19,7 @@ LayerTree::~LayerTree() = default; void LayerTree::Raster(CompositorContext::ScopedFrame& frame, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool ignore_raster_cache) { #if defined(OS_FUCHSIA) @@ -35,7 +35,7 @@ void LayerTree::Raster(CompositorContext::ScopedFrame& frame, void LayerTree::Preroll(CompositorContext::ScopedFrame& frame, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool ignore_raster_cache) { #if defined(OS_FUCHSIA) diff --git a/engine/src/flutter/flow/layers/layer_tree.h b/engine/src/flutter/flow/layers/layer_tree.h index a040180ad3..5ddebd088d 100644 --- a/engine/src/flutter/flow/layers/layer_tree.h +++ b/engine/src/flutter/flow/layers/layer_tree.h @@ -14,7 +14,7 @@ #include "lib/fxl/macros.h" #include "lib/fxl/time/time_delta.h" #if defined(OS_FUCHSIA) -#include "lib/ui/scenic/fidl/events.fidl.h" +#include #endif #include "third_party/skia/include/core/SkSize.h" @@ -29,13 +29,13 @@ class LayerTree { // Raster includes both Preroll and Paint. void Raster(CompositorContext::ScopedFrame& frame, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool ignore_raster_cache = false); void Preroll(CompositorContext::ScopedFrame& frame, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool ignore_raster_cache = false); diff --git a/engine/src/flutter/flow/raster_cache.cc b/engine/src/flutter/flow/raster_cache.cc index 472dbd6bd9..aa9fad0e28 100644 --- a/engine/src/flutter/flow/raster_cache.cc +++ b/engine/src/flutter/flow/raster_cache.cc @@ -74,7 +74,7 @@ RasterCacheResult RasterizePicture(SkPicture* picture, const MatrixDecomposition& matrix, SkColorSpace* dst_color_space, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool checkerboard) { TRACE_EVENT0("flutter", "RasterCachePopulate"); @@ -154,7 +154,7 @@ RasterCacheResult RasterCache::GetPrerolledImage( const SkMatrix& transformation_matrix, SkColorSpace* dst_color_space, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool is_complex, bool will_change) { diff --git a/engine/src/flutter/flow/raster_cache.h b/engine/src/flutter/flow/raster_cache.h index 3600866190..31201049b6 100644 --- a/engine/src/flutter/flow/raster_cache.h +++ b/engine/src/flutter/flow/raster_cache.h @@ -13,7 +13,7 @@ #include "lib/fxl/macros.h" #include "lib/fxl/memory/weak_ptr.h" #if defined(OS_FUCHSIA) -#include "lib/ui/scenic/fidl/events.fidl.h" +#include #endif #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSize.h" @@ -58,7 +58,7 @@ class RasterCache { const SkMatrix& transformation_matrix, SkColorSpace* dst_color_space, #if defined(OS_FUCHSIA) - ui::gfx::Metrics* metrics, + gfx::Metrics* metrics, #endif bool is_complex, bool will_change); diff --git a/engine/src/flutter/flow/scene_update_context.h b/engine/src/flutter/flow/scene_update_context.h index 32affd4ca0..ea1de24754 100644 --- a/engine/src/flutter/flow/scene_update_context.h +++ b/engine/src/flutter/flow/scene_update_context.h @@ -6,6 +6,7 @@ #define FLUTTER_FLOW_SCENE_UPDATE_CONTEXT_H_ #include +#include #include #include "flutter/flow/compositor_context.h" @@ -118,10 +119,10 @@ class SceneUpdateContext { scenic_lib::Session* session() { return session_; } bool has_metrics() const { return !!metrics_; } - void set_metrics(ui::gfx::MetricsPtr metrics) { + void set_metrics(gfx::MetricsPtr metrics) { metrics_ = std::move(metrics); } - const ui::gfx::MetricsPtr& metrics() const { return metrics_; } + const gfx::MetricsPtr& metrics() const { return metrics_; } void AddChildScene(ExportNode* export_node, SkPoint offset, @@ -181,7 +182,7 @@ class SceneUpdateContext { scenic_lib::Session* const session_; SurfaceProducer* const surface_producer_; - ui::gfx::MetricsPtr metrics_; + gfx::MetricsPtr metrics_; std::vector paint_tasks_;