projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-application.cpp updatet to match dali-core.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-application.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
index
d89d4d2
..
54a69bb
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-62,13
+62,13
@@
void TestApplication::Initialize()
// We always need the first update!
mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING;
// We always need the first update!
mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING;
- mCore = Dali::Integration::Core::New(
-
mRenderController
,
-
mPlatform
Abstraction,
-
mGl
Abstraction,
-
mGlSyncAbstraction
,
-
mGestureManager
,
-
mDataRetentionPolicy
);
+ mCore = Dali::Integration::Core::New(
mRenderController,
+
mPlatformAbstraction
,
+
mGl
Abstraction,
+
mGlSync
Abstraction,
+
mGestureManager
,
+
mDataRetentionPolicy
,
+
false
);
mCore->ContextCreated();
mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight );
mCore->ContextCreated();
mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight );
@@
-171,7
+171,7
@@
void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* l
unsigned int nextVSyncTime = mLastVSyncTime + intervalMilliseconds;
float elapsedSeconds = intervalMilliseconds / 1e3f;
unsigned int nextVSyncTime = mLastVSyncTime + intervalMilliseconds;
float elapsedSeconds = intervalMilliseconds / 1e3f;
- mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus );
+ mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus
, false, false
);
GetRenderController().Initialize();
GetRenderController().Initialize();