@@ -182,43 +182,43 @@ void FlatlandPlatformView::OnCreateView(ViewCallback on_view_created,
182
182
FML_CHECK (weak);
183
183
FML_CHECK (weak->child_view_info_ .count (content_id.value ) == 0 );
184
184
185
- // Bind the child view watcher to the platform thread so that the FIDL calls
186
- // are handled on the platform thread.
187
- fuchsia::ui::composition::ChildViewWatcherPtr child_view_watcher =
188
- child_view_watcher_handle.Bind ();
189
- FML_CHECK (child_view_watcher);
190
-
191
- child_view_watcher.set_error_handler (
192
- [weak, view_id, content_id](zx_status_t status) {
193
- FML_LOG (WARNING) << " Child disconnected. ChildViewWatcher status: "
194
- << status;
195
-
185
+ platform_task_runner->PostTask (fml::MakeCopyable (
186
+ [weak, view_id, content_id,
187
+ watcher_handle = std::move (child_view_watcher_handle)]() mutable {
196
188
if (!weak) {
197
189
FML_LOG (WARNING)
198
190
<< " Flatland View bound to PlatformView after PlatformView was "
199
191
" destroyed; ignoring." ;
200
192
return ;
201
193
}
202
194
203
- // Disconnected views cannot listen to pointer events.
204
- weak->pointer_injector_delegate_ ->OnDestroyView (view_id);
195
+ // Bind the child view watcher to the platform thread so that the FIDL
196
+ // calls are handled on the platform thread.
197
+ fuchsia::ui::composition::ChildViewWatcherPtr child_view_watcher =
198
+ watcher_handle.Bind ();
199
+ FML_CHECK (child_view_watcher);
205
200
206
- weak->OnChildViewDisconnected (content_id.value );
207
- });
208
-
209
- platform_task_runner->PostTask (
210
- fml::MakeCopyable ([weak, view_id, content_id,
211
- watcher = std::move (child_view_watcher)]() mutable {
212
- if (!weak) {
201
+ child_view_watcher.set_error_handler ([weak, view_id, content_id](
202
+ zx_status_t status) {
213
203
FML_LOG (WARNING)
214
- << " Flatland View bound to PlatformView after PlatformView was "
215
- " destroyed; ignoring." ;
216
- return ;
217
- }
204
+ << " Child disconnected. ChildViewWatcher status: " << status;
205
+
206
+ if (!weak) {
207
+ FML_LOG (WARNING) << " Flatland View bound to PlatformView after "
208
+ " PlatformView was "
209
+ " destroyed; ignoring." ;
210
+ return ;
211
+ }
212
+
213
+ // Disconnected views cannot listen to pointer events.
214
+ weak->pointer_injector_delegate_ ->OnDestroyView (view_id);
215
+
216
+ weak->OnChildViewDisconnected (content_id.value );
217
+ });
218
218
219
219
weak->child_view_info_ .emplace (
220
220
std::piecewise_construct, std::forward_as_tuple (content_id.value ),
221
- std::forward_as_tuple (view_id, std::move (watcher )));
221
+ std::forward_as_tuple (view_id, std::move (child_view_watcher )));
222
222
223
223
weak->child_view_info_ .at (content_id.value )
224
224
.child_view_watcher ->GetStatus (
0 commit comments