From afead7a0e5ec3c5007fefbd5e73944a062ed95e6 Mon Sep 17 00:00:00 2001 From: Anton Obzhirov Date: Fri, 8 Mar 2019 13:55:56 +0000 Subject: [PATCH 1/1] Change Adaptor implementation API in toolkit for multiple windows. Change-Id: Idc1fff53661dc485c92e40af63e44d03524214a3 --- .../src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp index 5d6cf4e..10a2659 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp @@ -68,12 +68,12 @@ Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration ) return Internal::Adaptor::Adaptor::Get(); } -Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurfaceInterface& surface ) +Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface ) { return Internal::Adaptor::Adaptor::Get(); } -Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration ) +Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration ) { return Internal::Adaptor::Adaptor::Get(); } @@ -130,7 +130,7 @@ void Adaptor::RemoveIdle( CallbackBase* callback ) } } -void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurfaceInterface& surface ) +void Adaptor::ReplaceSurface( Window window, Dali::RenderSurfaceInterface& surface ) { } -- 2.7.4