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 (file)
--- 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 ) {}