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
Merge "Add APIs for intercepting http request in web view." into devel/master
[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
062276a
..
a2a1848
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) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
@@
-55,9
+55,7
@@
void TestApplication::CreateCore()
mCore = Dali::Integration::Core::New(mRenderController,
mPlatformAbstraction,
mCore = Dali::Integration::Core::New(mRenderController,
mPlatformAbstraction,
- mGlAbstraction,
- mGlSyncAbstraction,
- mGlContextHelperAbstraction,
+ mGraphicsController,
Integration::RenderToFrameBuffer::FALSE,
Integration::DepthBufferAvailable::TRUE,
Integration::StencilBufferAvailable::TRUE,
Integration::RenderToFrameBuffer::FALSE,
Integration::DepthBufferAvailable::TRUE,
Integration::StencilBufferAvailable::TRUE,
@@
-141,19
+139,24
@@
TestRenderController& TestApplication::GetRenderController()
return mRenderController;
}
return mRenderController;
}
+TestGraphicsController& TestApplication::GetGraphicsController()
+{
+ return mGraphicsController;
+}
+
TestGlAbstraction& TestApplication::GetGlAbstraction()
{
TestGlAbstraction& TestApplication::GetGlAbstraction()
{
- return
mGlAbstraction
;
+ return
static_cast<TestGlAbstraction&>(mGraphicsController.GetGlAbstraction())
;
}
TestGlSyncAbstraction& TestApplication::GetGlSyncAbstraction()
{
}
TestGlSyncAbstraction& TestApplication::GetGlSyncAbstraction()
{
- return
mGlSyncAbstraction
;
+ return
static_cast<TestGlSyncAbstraction&>(mGraphicsController.GetGlSyncAbstraction())
;
}
TestGlContextHelperAbstraction& TestApplication::GetGlContextHelperAbstraction()
{
}
TestGlContextHelperAbstraction& TestApplication::GetGlContextHelperAbstraction()
{
- return
mGlContextHelperAbstraction
;
+ return
static_cast<TestGlContextHelperAbstraction&>(mGraphicsController.GetGlContextHelperAbstraction())
;
}
void TestApplication::ProcessEvent(const Integration::Event& event)
}
void TestApplication::ProcessEvent(const Integration::Event& event)
@@
-262,7
+265,7
@@
bool TestApplication::RenderOnly()
void TestApplication::ResetContext()
{
mCore->ContextDestroyed();
void TestApplication::ResetContext()
{
mCore->ContextDestroyed();
- mG
lAbstraction
.Initialize();
+ mG
raphicsController
.Initialize();
mCore->ContextCreated();
}
mCore->ContextCreated();
}