2424#include " third_party/rapidjson/include/rapidjson/writer.h"
2525
2626#include " flutter/fml/make_copyable.h"
27- #include " flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.h"
2827#include " flutter/shell/platform/fuchsia/flutter/text_delegate.h"
2928#include " flutter/shell/platform/fuchsia/flutter/vsync_waiter.h"
3029#include " flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h"
@@ -68,7 +67,6 @@ PlatformView::PlatformView(
6867 fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
6968 fuchsia::ui::composition::ParentViewportWatcherHandle
7069 parent_viewport_watcher,
71- fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
7270 OnEnableWireframeCallback wireframe_enabled_callback,
7371 OnCreateViewCallback on_create_view_callback,
7472 OnUpdateViewCallback on_update_view_callback,
@@ -104,9 +102,6 @@ PlatformView::PlatformView(
104102 dart_application_svc_(dart_application_svc),
105103 parent_viewport_watcher_(parent_viewport_watcher.Bind()),
106104 weak_factory_(this ) {
107- fuchsia::ui::views::ViewRef view_ref_clone;
108- fidl::Clone (view_ref, &view_ref_clone);
109-
110105 text_delegate_ =
111106 std::make_unique<TextDelegate>(
112107 std::move (view_ref), std::move (ime_service), std::move (keyboard),
@@ -163,10 +158,6 @@ PlatformView::PlatformView(
163158 weak->DispatchPointerDataPacket (std::move (packet));
164159 });
165160
166- // Configure the pointer injector delegate.
167- pointer_injector_delegate_ = std::make_unique<PointerInjectorDelegate>(
168- std::move (pointerinjector_registry), std::move (view_ref_clone));
169-
170161 // This is only used by the integration tests.
171162 if (dart_application_svc) {
172163 // Connect to TouchInputListener
@@ -418,12 +409,8 @@ void PlatformView::OnChildViewViewRef(uint64_t content_id,
418409 fuchsia::ui::views::ViewRef view_ref) {
419410 FML_CHECK (child_view_info_.count (content_id) == 1 );
420411
421- fuchsia::ui::views::ViewRef view_ref_clone;
422- fidl::Clone (view_ref, &view_ref_clone);
423-
424412 focus_delegate_->OnChildViewViewRef (view_id, std::move (view_ref));
425413
426- pointer_injector_delegate_->OnCreateView (view_id, std::move (view_ref_clone));
427414 OnChildViewConnected (content_id);
428415}
429416
@@ -457,7 +444,7 @@ void PlatformView::OnCreateView(ViewCallback on_view_created,
457444 watcher_handle.Bind ();
458445 FML_CHECK (child_view_watcher);
459446
460- child_view_watcher.set_error_handler ([weak, view_id, content_id](
447+ child_view_watcher.set_error_handler ([weak, content_id](
461448 zx_status_t status) {
462449 FML_LOG (WARNING )
463450 << " Child disconnected. ChildViewWatcher status: " << status;
@@ -469,9 +456,6 @@ void PlatformView::OnCreateView(ViewCallback on_view_created,
469456 return ;
470457 }
471458
472- // Disconnected views cannot listen to pointer events.
473- weak->pointer_injector_delegate_ ->OnDestroyView (view_id);
474-
475459 weak->OnChildViewDisconnected (content_id.value );
476460 });
477461
@@ -517,7 +501,6 @@ void PlatformView::OnDisposeView(int64_t view_id_raw) {
517501 weak->OnChildViewDisconnected (content_id.value );
518502 weak->child_view_info_ .erase (content_id.value );
519503 weak->focus_delegate_ ->OnDisposeChildView (view_id_raw);
520- weak->pointer_injector_delegate_ ->OnDestroyView (view_id_raw);
521504 });
522505 };
523506 on_destroy_view_callback_ (view_id_raw, std::move (on_view_unbound));
@@ -901,10 +884,6 @@ bool PlatformView::HandleFlutterPlatformViewsChannelPlatformMessage(
901884 } else if (method.rfind (" View.focus" , 0 ) == 0 ) {
902885 return focus_delegate_->HandlePlatformMessage (document,
903886 message->response ());
904- } else if (method.rfind (PointerInjectorDelegate::kPointerInjectorMethodPrefix ,
905- 0 ) == 0 ) {
906- return pointer_injector_delegate_->HandlePlatformMessage (
907- document, message->response ());
908887 } else {
909888 FML_LOG (ERROR ) << " Unknown " << message->channel () << " method " << method;
910889 }
0 commit comments