Merge branch 'devel/master' into devel/vulkan
authorDavid Steele <david.steele@samsung.com>
Thu, 31 May 2018 14:33:22 +0000 (15:33 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:35:05 +0000 (18:35 +0000)
commit36fda348b59968e584885d6bea5891a5059d86fb
treeb0892b298d37681f8d6b57ef6ad38434c7576880
parent3c660c6080b5db42bb053eee927b0019bb7a8b6d
Merge branch 'devel/master' into devel/vulkan

Change-Id: Ia7e36292a511597c183cb1505143c8ee1e1ec381
233 files changed:
.gitignore
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
automated-tests/src/dali/dali-test-suite-utils/test-application.cpp
automated-tests/src/dali/dali-test-suite-utils/test-application.h
automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.h
automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h
automated-tests/src/dali/utc-Dali-Actor.cpp
automated-tests/src/dali/utc-Dali-Animation.cpp
automated-tests/src/dali/utc-Dali-Handle.cpp
automated-tests/src/dali/utc-Dali-KeyEvent.cpp [changed mode: 0644->0755]
automated-tests/src/dali/utc-Dali-Matrix.cpp
automated-tests/src/dali/utc-Dali-Matrix3.cpp
automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
automated-tests/src/dali/utc-Dali-Processors.cpp [new file with mode: 0644]
automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
automated-tests/src/dali/utc-Dali-PropertyValue.cpp
automated-tests/src/dali/utc-Dali-Renderer.cpp
automated-tests/src/dali/utc-Dali-Stage.cpp [changed mode: 0644->0755]
automated-tests/src/dali/utc-Dali-TypeRegistry.cpp
build/scripts/dali_env
build/tizen/configure.ac
dali/devel-api/CMakeLists.txt
dali/devel-api/actors/actor-devel.cpp
dali/devel-api/actors/actor-devel.h
dali/devel-api/actors/custom-actor-devel.h
dali/devel-api/animation/animation-data.h
dali/devel-api/animation/animation-devel.h
dali/devel-api/animation/path-constrainer.h
dali/devel-api/common/hash.h
dali/devel-api/common/stage-devel.h
dali/devel-api/events/hit-test-algorithm.h
dali/devel-api/images/distance-field.h
dali/devel-api/images/nine-patch-image.h
dali/devel-api/images/texture-set-image.h
dali/devel-api/object/csharp-type-registry.h
dali/devel-api/object/handle-devel.cpp
dali/devel-api/object/handle-devel.h
dali/devel-api/rendering/renderer-devel.h
dali/devel-api/scripting/scripting.cpp
dali/devel-api/scripting/scripting.h
dali/devel-api/signals/signal-delegate.h
dali/devel-api/threading/conditional-wait.cpp
dali/devel-api/threading/conditional-wait.h
dali/devel-api/threading/mutex.cpp
dali/devel-api/threading/mutex.h
dali/devel-api/threading/thread.cpp
dali/devel-api/threading/thread.h
dali/integration-api/CMakeLists.txt
dali/integration-api/bitmap.h
dali/integration-api/core-enumerations.h [new file with mode: 0644]
dali/integration-api/core.cpp
dali/integration-api/core.h
dali/integration-api/debug.cpp
dali/integration-api/debug.h
dali/integration-api/events/event.h
dali/integration-api/events/gesture-event.h
dali/integration-api/events/gesture-requests.h
dali/integration-api/events/hover-event-integ.h
dali/integration-api/events/key-event-integ.cpp [changed mode: 0644->0755]
dali/integration-api/events/key-event-integ.h [changed mode: 0644->0755]
dali/integration-api/events/long-press-gesture-event.h
dali/integration-api/events/multi-point-event-integ.h
dali/integration-api/events/pan-gesture-event.h
dali/integration-api/events/pinch-gesture-event.h
dali/integration-api/events/point.h
dali/integration-api/events/tap-gesture-event.h
dali/integration-api/events/touch-event-combiner.h
dali/integration-api/events/touch-event-integ.h
dali/integration-api/events/wheel-event-integ.h
dali/integration-api/file.list
dali/integration-api/gesture-manager.h
dali/integration-api/input-options.cpp
dali/integration-api/input-options.h
dali/integration-api/lockless-buffer.h
dali/integration-api/profiling.h
dali/integration-api/system-overlay.h
dali/integration-api/trace.cpp [new file with mode: 0644]
dali/integration-api/trace.h [new file with mode: 0644]
dali/internal/CMakeLists.txt
dali/internal/common/core-impl.cpp
dali/internal/common/core-impl.h
dali/internal/common/mutex-trace.cpp [moved from dali/internal/common/mutex-impl.cpp with 87% similarity]
dali/internal/common/mutex-trace.h [moved from dali/internal/common/mutex-impl.h with 65% similarity]
dali/internal/event/actors/actor-impl.cpp
dali/internal/event/actors/actor-impl.h
dali/internal/event/animation/animator-connector.h
dali/internal/event/animation/constraint-impl.h
dali/internal/event/common/object-impl-helper.h
dali/internal/event/common/object-impl.cpp
dali/internal/event/common/object-impl.h
dali/internal/event/common/property-metadata.cpp
dali/internal/event/common/stage-impl.cpp
dali/internal/event/common/type-info-impl.cpp
dali/internal/event/common/type-info-impl.h
dali/internal/event/common/type-registry-impl.cpp
dali/internal/event/common/type-registry-impl.h
dali/internal/event/events/gesture-event-processor.cpp
dali/internal/event/events/gesture-event-processor.h
dali/internal/event/events/key-event-impl.cpp [changed mode: 0644->0755]
dali/internal/event/events/key-event-impl.h [changed mode: 0644->0755]
dali/internal/event/events/key-event-processor.cpp [changed mode: 0644->0755]
dali/internal/event/events/pan-gesture-processor.cpp
dali/internal/event/events/pan-gesture-processor.h
dali/internal/event/rendering/renderer-impl.cpp
dali/internal/event/rendering/renderer-impl.h
dali/internal/event/rendering/shader-impl.cpp
dali/internal/file.list
dali/internal/update/animation/property-accessor.h
dali/internal/update/animation/scene-graph-animation.cpp
dali/internal/update/animation/scene-graph-animator.h
dali/internal/update/animation/scene-graph-constraint-base.cpp
dali/internal/update/animation/scene-graph-constraint-base.h
dali/internal/update/common/animatable-property.h
dali/internal/update/common/property-owner.cpp
dali/internal/update/common/property-owner.h
dali/internal/update/common/property-resetter.h [new file with mode: 0644]
dali/internal/update/gestures/scene-graph-pan-gesture.cpp
dali/internal/update/gestures/scene-graph-pan-gesture.h
dali/internal/update/manager/render-instruction-processor.cpp
dali/internal/update/manager/update-algorithms.cpp
dali/internal/update/manager/update-manager.cpp
dali/internal/update/manager/update-manager.h
dali/internal/update/nodes/node.cpp
dali/internal/update/nodes/node.h
dali/internal/update/render-tasks/scene-graph-render-task.cpp
dali/internal/update/render-tasks/scene-graph-render-task.h
dali/internal/update/rendering/data-providers/render-data-provider.cpp
dali/internal/update/rendering/data-providers/render-data-provider.h
dali/internal/update/rendering/render-instruction-container.cpp
dali/internal/update/rendering/render-instruction-container.h
dali/internal/update/rendering/render-item.cpp
dali/internal/update/rendering/scene-graph-renderer.cpp
dali/internal/update/rendering/scene-graph-renderer.h
dali/public-api/CMakeLists.txt
dali/public-api/actors/actor.h
dali/public-api/actors/camera-actor.h
dali/public-api/actors/custom-actor-impl.h
dali/public-api/actors/custom-actor.h
dali/public-api/actors/layer.h
dali/public-api/actors/sampling.h [changed mode: 0644->0755]
dali/public-api/animation/alpha-function.h
dali/public-api/animation/animation.h
dali/public-api/animation/constraint-source.h
dali/public-api/animation/constraint.h
dali/public-api/animation/key-frames.h
dali/public-api/animation/linear-constrainer.h
dali/public-api/animation/path.h
dali/public-api/animation/time-period.h
dali/public-api/common/constants.h
dali/public-api/common/dali-common.cpp
dali/public-api/common/dali-common.h [changed mode: 0644->0755]
dali/public-api/common/dali-vector.h [changed mode: 0644->0755]
dali/public-api/common/extents.h
dali/public-api/common/stage.h
dali/public-api/dali-core-version.cpp
dali/public-api/dali-core-version.h
dali/public-api/events/gesture-detector.h
dali/public-api/events/gesture.h
dali/public-api/events/hover-event.h
dali/public-api/events/key-event.cpp [changed mode: 0644->0755]
dali/public-api/events/key-event.h [changed mode: 0644->0755]
dali/public-api/events/long-press-gesture-detector.h
dali/public-api/events/long-press-gesture.h
dali/public-api/events/pan-gesture-detector.h
dali/public-api/events/pan-gesture.h
dali/public-api/events/pinch-gesture-detector.h
dali/public-api/events/pinch-gesture.h
dali/public-api/events/tap-gesture-detector.h
dali/public-api/events/tap-gesture.h
dali/public-api/events/touch-data.h
dali/public-api/events/touch-event.h
dali/public-api/events/touch-point.h
dali/public-api/events/wheel-event.h
dali/public-api/images/buffer-image.h
dali/public-api/images/encoded-buffer-image.h
dali/public-api/images/frame-buffer-image.h
dali/public-api/images/image.h
dali/public-api/images/native-image.h
dali/public-api/images/pixel-data.h
dali/public-api/images/pixel.h
dali/public-api/images/resource-image.h
dali/public-api/math/degree.h
dali/public-api/math/math-utils.h
dali/public-api/math/matrix.cpp
dali/public-api/math/matrix.h
dali/public-api/math/matrix3.cpp
dali/public-api/math/matrix3.h
dali/public-api/math/quaternion.h
dali/public-api/math/vector2.h
dali/public-api/math/vector3.h
dali/public-api/math/vector4.h
dali/public-api/object/any.h
dali/public-api/object/base-handle.h
dali/public-api/object/base-object.h
dali/public-api/object/handle.h
dali/public-api/object/object-registry.h
dali/public-api/object/property-array.h
dali/public-api/object/property-conditions.h
dali/public-api/object/property-input.h
dali/public-api/object/property-key.h
dali/public-api/object/property-map.h
dali/public-api/object/property-notification.h
dali/public-api/object/property-types.cpp
dali/public-api/object/property-types.h
dali/public-api/object/property-value.h
dali/public-api/object/property.h
dali/public-api/object/ref-object.h
dali/public-api/object/type-info.cpp
dali/public-api/object/type-info.h
dali/public-api/object/type-registry.cpp
dali/public-api/object/type-registry.h
dali/public-api/object/weak-handle.h
dali/public-api/render-tasks/render-task-list.h
dali/public-api/render-tasks/render-task.h
dali/public-api/rendering/frame-buffer.h
dali/public-api/rendering/geometry.h
dali/public-api/rendering/property-buffer.h
dali/public-api/rendering/renderer.h
dali/public-api/rendering/sampler.h
dali/public-api/rendering/shader.h
dali/public-api/rendering/texture-set.h
dali/public-api/rendering/texture.h
dali/public-api/signals/base-signal.h
dali/public-api/signals/callback.h
dali/public-api/signals/connection-tracker-interface.h
dali/public-api/signals/connection-tracker.h
dali/public-api/signals/functor-delegate.h
dali/public-api/signals/signal-slot-connections.h
dali/public-api/signals/signal-slot-observers.h
packaging/dali.spec