From 44dbdbe3ef30f8fc5a15375dcc3407d6642f5e4c Mon Sep 17 00:00:00 2001 From: mikejurka Date: Thu, 22 Feb 2018 21:34:48 -0800 Subject: [PATCH] [fuchsia] Renamed PresentationInfo (#4702) --- content_handler/session_connection.cc | 4 ++-- content_handler/session_connection.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content_handler/session_connection.cc b/content_handler/session_connection.cc index efad96b2b36..4d2508068b9 100644 --- a/content_handler/session_connection.cc +++ b/content_handler/session_connection.cc @@ -22,7 +22,7 @@ SessionConnection::SessionConnection(scenic::SceneManagerPtr scene_manager, root_node_.Bind(std::move(import_token)); root_node_.SetEventMask(scenic::kMetricsEventMask); - session_.Present(0, [](scenic::PresentationInfoPtr info) {}); + session_.Present(0, [](ui_mozart::PresentationInfoPtr info) {}); present_callback_ = std::bind(&SessionConnection::OnPresent, this, std::placeholders::_1); @@ -80,7 +80,7 @@ void SessionConnection::Present(flow::CompositorContext::ScopedFrame& frame, EnqueueClearOps(); } -void SessionConnection::OnPresent(scenic::PresentationInfoPtr info) { +void SessionConnection::OnPresent(ui_mozart::PresentationInfoPtr info) { ASSERT_IS_GPU_THREAD; auto callback = pending_on_present_callback_; pending_on_present_callback_ = nullptr; diff --git a/content_handler/session_connection.h b/content_handler/session_connection.h index 5f43cb80d2b..16d5f76de55 100644 --- a/content_handler/session_connection.h +++ b/content_handler/session_connection.h @@ -61,7 +61,7 @@ class SessionConnection { void EnqueueClearOps(); - void OnPresent(scenic::PresentationInfoPtr info); + void OnPresent(ui_mozart::PresentationInfoPtr info); FXL_DISALLOW_COPY_AND_ASSIGN(SessionConnection); };