From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Wed, 2 May 2018 13:02:08 +0000 (+0000)
Subject: Merge changes I90752dc1,If040eaa9,I50559f33 into devel/master
X-Git-Tag: dali_1.3.23~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=66744c07d3e347ffdc36b52e5aad4b03fbc598ae;hp=cba33351125114b93ad1ed2280ac220600717465

Merge changes I90752dc1,If040eaa9,I50559f33 into devel/master

* changes:
  Fixed child property accessor in FlexContainer
  Enforced member initialization for TextureManagerImpl class
  Adding debug methods for Control internals
---

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
index 06350f5..e5d4a70 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
@@ -38,6 +38,8 @@ class TestRenderSurface : public RenderSurface
 public:
   virtual PositionSize GetPositionSize() const { PositionSize size; return size; }
 
+  virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
+
   virtual void InitializeEgl( EglInterface& egl ) {}
 
   virtual void CreateEglSurface( EglInterface& egl ) {}