wip

Author: arbreng

flow/scene_update_context.cc

@@ -68,16 +68,16 @@ void SetMaterialColor(scenic::Material& material,
 SceneUpdateContext::SceneUpdateContext(std::string debug_label,
                                        fuchsia::ui::views::ViewToken view_token,
                                        scenic::ViewRefPair view_ref_pair,
-                                       SessionWrapper& session,
+                                       scenic::Session* session,
                                        bool intercept_all_input)
     : session_(session),
-      root_view_(session_.get(),
+      root_view_(session_,
                  std::move(view_token),
                  std::move(view_ref_pair.control_ref),
                  std::move(view_ref_pair.view_ref),
                  debug_label),
-      metrics_node_(session.get()),
-      layer_tree_node_(session_.get()) {
+      metrics_node_(session_),
+      layer_tree_node_(session_) {
   layer_tree_node_.SetLabel("Flutter::LayerTree");
   metrics_node_.SetLabel("Flutter::MetricsWatcher");
   metrics_node_.SetEventMask(fuchsia::ui::gfx::kMetricsEventMask);
@@ -88,16 +88,14 @@ SceneUpdateContext::SceneUpdateContext(std::string debug_label,
   // will capture all input, and any unwanted input will be reinjected into
   // embedded views.
   if (intercept_all_input) {
-    input_interceptor_node_.emplace(session_.get());
+    input_interceptor_node_.emplace(session_);
     input_interceptor_node_->SetLabel("Flutter::InputInterceptor");
     input_interceptor_node_->SetHitTestBehavior(
         fuchsia::ui::gfx::HitTestBehavior::kDefault);
     input_interceptor_node_->SetSemanticVisibility(false);
 
     metrics_node_.AddChild(input_interceptor_node_.value());
   }
-
-  session_.Present();
 }
 
 std::vector<SceneUpdateContext::PaintTask> SceneUpdateContext::GetPaintTasks() {
@@ -109,7 +107,7 @@ std::vector<SceneUpdateContext::PaintTask> SceneUpdateContext::GetPaintTasks() {
 }
 
 void SceneUpdateContext::EnableWireframe(bool enable) {
-  session_.get()->Enqueue(
+  session_->Enqueue(
       scenic::NewSetEnableDebugViewBoundsCmd(root_view_.id(), enable));
 }
 
@@ -132,8 +130,8 @@ void SceneUpdateContext::Reset(const SkISize& frame_size,
     // TODO(fxb/): Don't hardcode elevation.
     input_interceptor_node_->SetTranslation(frame_size.width() * 0.5f,
                                             frame_size.height() * 0.5f, -100.f);
-    input_interceptor_node_->SetShape(scenic::Rectangle(
-        session_.get(), frame_size.width(), frame_size.height()));
+    input_interceptor_node_->SetShape(
+        scenic::Rectangle(session_, frame_size.width(), frame_size.height()));
   }
 
   // We are going to be sending down a fresh node hierarchy every frame. So just
@@ -156,8 +154,8 @@ void SceneUpdateContext::CreateFrame(scenic::EntityNode& entity_node,
   SetEntityNodeClipPlanes(entity_node, shape_bounds);
 
   // TODO(SCN-137): Need to be able to express the radii as vectors.
-  scenic::ShapeNode shape_node(session_.get());
-  scenic::Rectangle shape(session_.get(), rrect.width(), rrect.height());
+  scenic::ShapeNode shape_node(session_);
+  scenic::Rectangle shape(session_, rrect.width(), rrect.height());
   shape_node.SetShape(shape);
   shape_node.SetTranslation(shape_bounds.width() * 0.5f + shape_bounds.left(),
                             shape_bounds.height() * 0.5f + shape_bounds.top(),
@@ -167,7 +165,7 @@ void SceneUpdateContext::CreateFrame(scenic::EntityNode& entity_node,
   if (paint_bounds.isEmpty() || !paint_bounds.intersects(shape_bounds))
     paint_layers.clear();
 
-  scenic::Material material(session_.get());
+  scenic::Material material(session_);
   shape_node.SetMaterial(material);
   entity_node.AddChild(shape_node);
 
@@ -214,9 +212,8 @@ void SceneUpdateContext::UpdateView(int64_t view_id,
   bool hit_testable = override_hit_testable.has_value()
                           ? *override_hit_testable
                           : view_holder->hit_testable();
-  view_holder->UpdateScene(session_.get(), top_entity_->embedder_node(), offset,
-                           size, SkScalarRoundToInt(alphaf() * 255),
-                           hit_testable);
+  view_holder->UpdateScene(session_, top_entity_->embedder_node(), offset, size,
+                           SkScalarRoundToInt(alphaf() * 255), hit_testable);
 
   // Assume embedded views are 10 "layers" wide.
   next_elevation_ += 10 * kScenicZElevationBetweenLayers;
@@ -257,7 +254,7 @@ void SceneUpdateContext::DestroyView(int64_t view_id) {
 SceneUpdateContext::Entity::Entity(std::shared_ptr<SceneUpdateContext> context)
     : context_(context),
       previous_entity_(context->top_entity_),
-      entity_node_(context->session_.get()) {
+      entity_node_(context->session_) {
   context->top_entity_ = this;
 }
 
@@ -338,7 +335,7 @@ SceneUpdateContext::Frame::Frame(std::shared_ptr<SceneUpdateContext> context,
       rrect_(rrect),
       color_(color),
       opacity_(opacity),
-      opacity_node_(context->session_.get()),
+      opacity_node_(context->session_),
       paint_bounds_(SkRect::MakeEmpty()) {
   // Increment elevation trackers before calculating any local elevation.
   // |UpdateView| can modify context->next_elevation_, which is why it is

flow/scene_update_context.h

@@ -15,9 +15,9 @@
 #include <set>
 #include <vector>
 
-#include "flutter/flow/embedded_views.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
+#include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
@@ -34,15 +34,7 @@ constexpr float kOneMinusEpsilon = 1 - FLT_EPSILON;
 // How much layers are separated in Scenic z elevation.
 constexpr float kScenicZElevationBetweenLayers = 10.f;
 
-class SessionWrapper {
- public:
-  virtual ~SessionWrapper() {}
-
-  virtual scenic::Session* get() = 0;
-  virtual void Present() = 0;
-};
-
-class SceneUpdateContext : public flutter::ExternalViewEmbedder {
+class SceneUpdateContext {
  public:
   class Entity {
    public:
@@ -122,7 +114,7 @@ class SceneUpdateContext : public flutter::ExternalViewEmbedder {
   SceneUpdateContext(std::string debug_label,
                      fuchsia::ui::views::ViewToken view_token,
                      scenic::ViewRefPair view_ref_pair,
-                     SessionWrapper& session,
+                     scenic::Session* session,
                      bool intercept_all_input = false);
   ~SceneUpdateContext() = default;
 
@@ -139,34 +131,7 @@ class SceneUpdateContext : public flutter::ExternalViewEmbedder {
   // Reset state for a new frame.
   void Reset(const SkISize& frame_size, float device_pixel_ratio);
 
-  // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override { return nullptr; }
-
-  // |ExternalViewEmbedder|
-  void CancelFrame() override {}
-
-  // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override {}
-
-  // |ExternalViewEmbedder|
-  void PrerollCompositeEmbeddedView(
-      int view_id,
-      std::unique_ptr<EmbeddedViewParams> params) override {}
-
-  // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override {
-    return std::vector<SkCanvas*>();
-  }
-
-  // |ExternalViewEmbedder|
-  virtual SkCanvas* CompositeEmbeddedView(int view_id) override {
-    return nullptr;
-  }
-
+  // View manipulation.
   void CreateView(int64_t view_id, bool hit_testable, bool focusable);
   void UpdateView(int64_t view_id, bool hit_testable, bool focusable);
   void DestroyView(int64_t view_id);
@@ -183,7 +148,7 @@ class SceneUpdateContext : public flutter::ExternalViewEmbedder {
                    const SkRect& paint_bounds,
                    std::vector<Layer*> paint_layers);
 
-  SessionWrapper& session_;
+  scenic::Session* session_;
 
   scenic::View root_view_;
   scenic::EntityNode metrics_node_;

shell/platform/fuchsia/BUILD.gn

@@ -87,5 +87,5 @@ group("fuchsia") {
 group("tests") {
   testonly = true
 
-  deps = [ "flutter:tests" ]
+  #deps = [ "flutter:tests" ]
 }

shell/platform/fuchsia/flutter/BUILD.gn

@@ -49,12 +49,12 @@ template("runner_sources") {
 
   source_set(target_name) {
     sources = [
-      "accessibility_bridge.cc",
-      "accessibility_bridge.h",
-      "component.cc",
-      "component.h",
-      "engine.cc",
-      "engine.h",
+      #"accessibility_bridge.cc",
+      #"accessibility_bridge.h",
+      #"component.cc",
+      #"component.h",
+      #"engine.cc",
+      #"engine.h",
       "flutter_runner_product_configuration.cc",
       "flutter_runner_product_configuration.h",
       "fuchsia_external_view_embedder.cc",
@@ -68,10 +68,10 @@ template("runner_sources") {
       "logging.h",
       "loop.cc",
       "loop.h",
-      "platform_view.cc",
-      "platform_view.h",
-      "runner.cc",
-      "runner.h",
+      #"platform_view.cc",
+      #"platform_view.h",
+      #"runner.cc",
+      #"runner.h",
       "session_connection.cc",
       "session_connection.h",
       "surface.cc",