Revert "Smooth out iOS irregular input events delivery (#11817)" (#12251

)

This reverts commit b569e8c.

ci/licenses_golden/licenses_flutter

@@ -485,7 +485,6 @@ FILE: ../../../flutter/shell/common/canvas_spy_unittests.cc
 FILE: ../../../flutter/shell/common/engine.cc
 FILE: ../../../flutter/shell/common/engine.h
 FILE: ../../../flutter/shell/common/fixtures/shell_test.dart
-FILE: ../../../flutter/shell/common/input_events_unittests.cc
 FILE: ../../../flutter/shell/common/isolate_configuration.cc
 FILE: ../../../flutter/shell/common/isolate_configuration.h
 FILE: ../../../flutter/shell/common/persistent_cache.cc
@@ -495,8 +494,6 @@ FILE: ../../../flutter/shell/common/pipeline.h
 FILE: ../../../flutter/shell/common/pipeline_unittests.cc
 FILE: ../../../flutter/shell/common/platform_view.cc
 FILE: ../../../flutter/shell/common/platform_view.h
-FILE: ../../../flutter/shell/common/pointer_data_dispatcher.cc
-FILE: ../../../flutter/shell/common/pointer_data_dispatcher.h
 FILE: ../../../flutter/shell/common/rasterizer.cc
 FILE: ../../../flutter/shell/common/rasterizer.h
 FILE: ../../../flutter/shell/common/run_configuration.cc

shell/common/BUILD.gn

@@ -74,8 +74,6 @@ source_set("common") {
     "pipeline.h",
     "platform_view.cc",
     "platform_view.h",
-    "pointer_data_dispatcher.cc",
-    "pointer_data_dispatcher.h",
     "rasterizer.cc",
     "rasterizer.h",
     "run_configuration.cc",
@@ -158,7 +156,6 @@ if (current_toolchain == host_toolchain) {
   shell_host_executable("shell_unittests") {
     sources = [
       "canvas_spy_unittests.cc",
-      "input_events_unittests.cc",
       "pipeline_unittests.cc",
       "shell_test.cc",
       "shell_test.h",

shell/common/engine.cc

@@ -36,7 +36,6 @@ static constexpr char kSettingsChannel[] = "flutter/settings";
 static constexpr char kIsolateChannel[] = "flutter/isolate";
 
 Engine::Engine(Delegate& delegate,
-               PointerDataDispatcherMaker& dispatcher_maker,
                DartVM& vm,
                fml::RefPtr<const DartSnapshot> isolate_snapshot,
                fml::RefPtr<const DartSnapshot> shared_snapshot,
@@ -61,7 +60,7 @@ Engine::Engine(Delegate& delegate,
       &vm,                                   // VM
       std::move(isolate_snapshot),           // isolate snapshot
       std::move(shared_snapshot),            // shared snapshot
-      task_runners,                          // task runners
+      std::move(task_runners),               // task runners
       std::move(io_manager),                 // io manager
       image_decoder_.GetWeakPtr(),           // image decoder
       settings_.advisory_script_uri,         // advisory script uri
@@ -70,9 +69,6 @@ Engine::Engine(Delegate& delegate,
       settings_.isolate_create_callback,     // isolate create callback
       settings_.isolate_shutdown_callback    // isolate shutdown callback
   );
-
-  pointer_data_dispatcher_ = dispatcher_maker(*animator_, *runtime_controller_,
-                                              std::move(task_runners));
 }
 
 Engine::~Engine() = default;
@@ -385,12 +381,12 @@ void Engine::HandleSettingsPlatformMessage(PlatformMessage* message) {
   }
 }
 
-void Engine::DispatchPointerDataPacket(
-    std::unique_ptr<PointerDataPacket> packet,
-    uint64_t trace_flow_id) {
+void Engine::DispatchPointerDataPacket(const PointerDataPacket& packet,
+                                       uint64_t trace_flow_id) {
   TRACE_EVENT0("flutter", "Engine::DispatchPointerDataPacket");
   TRACE_FLOW_STEP("flutter", "PointerEvent", trace_flow_id);
-  pointer_data_dispatcher_->DispatchPacket(std::move(packet), trace_flow_id);
+  animator_->EnqueueTraceFlowId(trace_flow_id);
+  runtime_controller_->DispatchPointerDataPacket(packet);
 }
 
 void Engine::DispatchSemanticsAction(int id,
@@ -438,8 +434,6 @@ void Engine::Render(std::unique_ptr<flutter::LayerTree> layer_tree) {
 
   layer_tree->set_frame_size(frame_size);
   animator_->Render(std::move(layer_tree));
-
-  pointer_data_dispatcher_->OnFrameLayerTreeReceived();
 }
 
 void Engine::UpdateSemantics(SemanticsNodeUpdates update,

shell/common/engine.h

@@ -22,8 +22,6 @@
 #include "flutter/runtime/runtime_controller.h"
 #include "flutter/runtime/runtime_delegate.h"
 #include "flutter/shell/common/animator.h"
-#include "flutter/shell/common/platform_view.h"
-#include "flutter/shell/common/pointer_data_dispatcher.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/run_configuration.h"
 #include "flutter/shell/common/shell_io_manager.h"
@@ -236,12 +234,6 @@ class Engine final : public RuntimeDelegate {
   ///                                tasks that require access to components
   ///                                that cannot be safely accessed by the
   ///                                engine. This is the shell.
-  /// @param      dispatcher_maker   The `std::function` provided by
-  ///                                `PlatformView` for engine to create the
-  ///                                pointer data dispatcher. Similar to other
-  ///                                engine resources, this dispatcher_maker and
-  ///                                its returned dispatcher is only safe to be
-  ///                                called from the UI thread.
   /// @param      vm                 An instance of the running Dart VM.
   /// @param[in]  isolate_snapshot   The snapshot used to create the root
   ///                                isolate. Even though the isolate is not
@@ -273,7 +265,6 @@ class Engine final : public RuntimeDelegate {
   ///                                GPU.
   ///
   Engine(Delegate& delegate,
-         PointerDataDispatcherMaker& dispatcher_maker,
          DartVM& vm,
          fml::RefPtr<const DartSnapshot> isolate_snapshot,
          fml::RefPtr<const DartSnapshot> shared_snapshot,
@@ -658,7 +649,7 @@ class Engine final : public RuntimeDelegate {
   ///                            timeline and allow grouping frames and input
   ///                            events into logical chunks.
   ///
-  void DispatchPointerDataPacket(std::unique_ptr<PointerDataPacket> packet,
+  void DispatchPointerDataPacket(const PointerDataPacket& packet,
                                  uint64_t trace_flow_id);
 
   //----------------------------------------------------------------------------
@@ -714,7 +705,6 @@ class Engine final : public RuntimeDelegate {
   const Settings settings_;
   std::unique_ptr<Animator> animator_;
   std::unique_ptr<RuntimeController> runtime_controller_;
-  std::unique_ptr<PointerDataDispatcher> pointer_data_dispatcher_;
   std::string initial_route_;
   ViewportMetrics viewport_metrics_;
   std::shared_ptr<AssetManager> asset_manager_;

shell/common/fixtures/shell_test.dart

@@ -11,7 +11,6 @@ void main() {}
 
 void nativeReportTimingsCallback(List<int> timings) native 'NativeReportTimingsCallback';
 void nativeOnBeginFrame(int microseconds) native 'NativeOnBeginFrame';
-void nativeOnPointerDataPacket() native 'NativeOnPointerDataPacket';
 
 @pragma('vm:entry-point')
 void reportTimingsMain() {
@@ -33,16 +32,6 @@ void onBeginFrameMain() {
   };
 }
 
-@pragma('vm:entry-point')
-void onPointerDataPacketMain() {
-  window.onPointerDataPacket = (PointerDataPacket packet) {
-    nativeOnPointerDataPacket();
-  };
-  window.onBeginFrame = (Duration beginTime) {
-    nativeOnBeginFrame(beginTime.inMicroseconds);
-  };
-}
-
 @pragma('vm:entry-point')
 void emptyMain() {}