From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 1 Apr 2021 17:06:50 +0000 (+0000)
Subject: Merge "Implements CanvasView control" into devel/master
X-Git-Tag: dali_2.0.21~14
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7f472b6fa56d5382514b9abb9a4c71419189acff;hp=-c

Merge "Implements CanvasView control" into devel/master
---

7f472b6fa56d5382514b9abb9a4c71419189acff
diff --combined automated-tests/src/dali-toolkit/CMakeLists.txt
index 7649466,1b8e5f7..c3ab255
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -14,6 -14,7 +14,7 @@@ SET(TC_SOURCE
    utc-Dali-BloomView.cpp
    utc-Dali-BubbleEmitter.cpp
    utc-Dali-Builder.cpp
+   utc-Dali-CanvasView.cpp
    utc-Dali-CheckBoxButton.cpp
    utc-Dali-ConfirmationPopup.cpp
    utc-Dali-CubeTransitionEffect.cpp
@@@ -45,7 -46,6 +46,7 @@@
    utc-Dali-Tooltip.cpp
    utc-Dali-TransitionData.cpp
    utc-Dali-Button.cpp
 +  utc-Dali-CameraView.cpp
    utc-Dali-Control.cpp
    utc-Dali-ControlImpl.cpp
    utc-Dali-ItemLayout.cpp
@@@ -78,6 -78,7 +79,7 @@@
  SET(TEST_HARNESS_SOURCES
    dali-toolkit-test-utils/toolkit-adaptor.cpp
    dali-toolkit-test-utils/toolkit-application.cpp
+   dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
    dali-toolkit-test-utils/toolkit-clipboard.cpp
    dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
    dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
@@@ -111,15 -112,6 +113,15 @@@
    dali-toolkit-test-utils/test-gesture-generator.cpp
    dali-toolkit-test-utils/test-gl-abstraction.cpp
    dali-toolkit-test-utils/test-gl-sync-abstraction.cpp
 +  dali-toolkit-test-utils/test-graphics-buffer.cpp
 +  dali-toolkit-test-utils/test-graphics-command-buffer.cpp
 +  dali-toolkit-test-utils/test-graphics-controller.cpp
 +  dali-toolkit-test-utils/test-graphics-texture.cpp
 +  dali-toolkit-test-utils/test-graphics-pipeline.cpp
 +  dali-toolkit-test-utils/test-graphics-program.cpp
 +  dali-toolkit-test-utils/test-graphics-reflection.cpp
 +  dali-toolkit-test-utils/test-graphics-sampler.cpp
 +  dali-toolkit-test-utils/test-graphics-shader.cpp
    dali-toolkit-test-utils/test-platform-abstraction.cpp
    dali-toolkit-test-utils/test-render-controller.cpp
    dali-toolkit-test-utils/test-trace-call-stack.cpp
diff --combined dali-toolkit/devel-api/file.list
index 766c8ac,e94ebe7..cc7dd45
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@@ -10,6 -10,7 +10,7 @@@ SET( devel_api_src_file
    ${devel_api_src_dir}/builder/json-parser.cpp
    ${devel_api_src_dir}/builder/tree-node.cpp
    ${devel_api_src_dir}/controls/accessible-impl.cpp
+   ${devel_api_src_dir}/controls/canvas-view/canvas-view.cpp
    ${devel_api_src_dir}/controls/control-devel.cpp
    ${devel_api_src_dir}/controls/control-wrapper.cpp
    ${devel_api_src_dir}/controls/control-wrapper-impl.cpp
@@@ -41,7 -42,6 +42,7 @@@
    ${devel_api_src_dir}/controls/web-view/web-back-forward-list-item.cpp
    ${devel_api_src_dir}/controls/web-view/web-context.cpp
    ${devel_api_src_dir}/controls/web-view/web-cookie-manager.cpp
 +  ${devel_api_src_dir}/controls/web-view/web-form-repost-decision.cpp
    ${devel_api_src_dir}/controls/web-view/web-settings.cpp
    ${devel_api_src_dir}/controls/web-view/web-view.cpp
    ${devel_api_src_dir}/focus-manager/keyinput-focus-manager.cpp
@@@ -84,6 -84,7 +85,7 @@@ SET( devel_api_accessibility-manager_he
  
  SET( devel_api_controls_header_files
    ${devel_api_src_dir}/controls/accessible-impl.h
+   ${devel_api_src_dir}/controls/canvas-view/canvas-view.h
    ${devel_api_src_dir}/controls/control-depth-index-ranges.h
    ${devel_api_src_dir}/controls/control-devel.h
    ${devel_api_src_dir}/controls/control-wrapper.h
@@@ -257,7 -258,6 +259,7 @@@ SET( devel_api_web_view_header_file
    ${devel_api_src_dir}/controls/web-view/web-back-forward-list-item.h
    ${devel_api_src_dir}/controls/web-view/web-context.h
    ${devel_api_src_dir}/controls/web-view/web-cookie-manager.h
 +  ${devel_api_src_dir}/controls/web-view/web-form-repost-decision.h
    ${devel_api_src_dir}/controls/web-view/web-settings.h
    ${devel_api_src_dir}/controls/web-view/web-view.h
  )
diff --combined dali-toolkit/internal/file.list
index 4703752,1fd9511..4ac8dea
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@@ -61,6 -61,7 +61,7 @@@ SET( toolkit_src_file
     ${toolkit_src_dir}/controls/buttons/push-button-impl.cpp
     ${toolkit_src_dir}/controls/buttons/radio-button-impl.cpp
     ${toolkit_src_dir}/controls/buttons/toggle-button-impl.cpp
+    ${toolkit_src_dir}/controls/canvas-view/canvas-view-impl.cpp
     ${toolkit_src_dir}/controls/control/control-data-impl.cpp
     ${toolkit_src_dir}/controls/control/control-debug.cpp
     ${toolkit_src_dir}/controls/control/control-renderers.cpp
@@@ -106,7 -107,6 +107,7 @@@
     ${toolkit_src_dir}/controls/tooltip/tooltip.cpp
     ${toolkit_src_dir}/controls/video-view/video-view-impl.cpp
     ${toolkit_src_dir}/controls/web-view/web-view-impl.cpp
 +   ${toolkit_src_dir}/controls/camera-view/camera-view-impl.cpp
     ${toolkit_src_dir}/accessibility-manager/accessibility-manager-impl.cpp
  
     ${toolkit_src_dir}/feedback/feedback-style.cpp