Merge "Raise SceneCreated signal with stage." into tizen

diff --git a/adaptors/common/feedback/feedback-plugin-proxy.h b/adaptors/common/feedback/feedback-plugin-proxy.h
index ff1cf3f..e04f22b 100644 (file)
--- a/adaptors/common/feedback/feedback-plugin-proxy.h
+++ b/adaptors/common/feedback/feedback-plugin-proxy.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <string>
+
 // INTERNAL INCLUDES
 #include <feedback-plugin.h>
 

diff --git a/adaptors/public-api/adaptor-framework/feedback-plugin.h b/adaptors/public-api/adaptor-framework/feedback-plugin.h
index 94d23fd..d39e837 100644 (file)
--- a/adaptors/public-api/adaptor-framework/feedback-plugin.h
+++ b/adaptors/public-api/adaptor-framework/feedback-plugin.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <string>
 #include <dali/public-api/common/dali-common.h>
 
 namespace Dali

diff --git a/adaptors/public-api/adaptor-framework/pixmap-image.h b/adaptors/public-api/adaptor-framework/pixmap-image.h
index 05196bc..e0425a7 100644 (file)
--- a/adaptors/public-api/adaptor-framework/pixmap-image.h
+++ b/adaptors/public-api/adaptor-framework/pixmap-image.h
@@ -19,6 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
+#include <string>
+
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/images/native-image.h>
 #include <dali/public-api/object/any.h>

diff --git a/adaptors/public-api/adaptor-framework/style-change.h b/adaptors/public-api/adaptor-framework/style-change.h
index 2023d69..b7c0cb9 100644 (file)
--- a/adaptors/public-api/adaptor-framework/style-change.h
+++ b/adaptors/public-api/adaptor-framework/style-change.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <string>
 #include <dali/public-api/common/dali-common.h>
 
 namespace Dali
@@ -32,13 +33,6 @@ namespace Dali
  */
 struct DALI_IMPORT_API StyleChange
 {
-  // Data
-
-  bool defaultFontChange:1;     ///< Denotes that the default font has changed.
-  bool defaultFontSizeChange:1; ///< Denotes that the default font size has changed.
-  bool themeChange:1;           ///< Denotes that the theme has changed.
-  std::string themeFilePath;    ///< Contains the path to the new theme file.
-
   // Construction
 
   /**
@@ -50,6 +44,13 @@ struct DALI_IMPORT_API StyleChange
     themeChange(false)
   {
   }
+
+  // Data
+
+  bool defaultFontChange:1;     ///< Denotes that the default font has changed.
+  bool defaultFontSizeChange:1; ///< Denotes that the default font size has changed.
+  bool themeChange:1;           ///< Denotes that the theme has changed.
+  std::string themeFilePath;    ///< Contains the path to the new theme file.
 };
 
 } // namespace Dali

diff --git a/adaptors/wayland/ecore-wl-render-surface.cpp b/adaptors/wayland/ecore-wl-render-surface.cpp
index 158323e..e164ab2 100644 (file)
--- a/adaptors/wayland/ecore-wl-render-surface.cpp
+++ b/adaptors/wayland/ecore-wl-render-surface.cpp
@@ -210,22 +210,13 @@ void RenderSurface::SetDisplay( Any display )
   if ( display.Empty() == false )
   {
     // check we have a valid type
-    DALI_ASSERT_ALWAYS( ( ( display.GetType() == typeid (Ecore_Wl_Display *)) ||
-                          ( display.GetType() == typeid (WlDisplay *) ) )
+    DALI_ASSERT_ALWAYS( ( display.GetType() == typeid (WlDisplay *) )
                         &&
                         "Display type is invalid" );
 
     mOwnDisplay = false;
 
-    // display may point to EcoreXDisplay so may need to cast
-    if( display.GetType() == typeid (Ecore_Wl_Display*) )
-    {
-      mMainDisplay = static_cast< WlDisplay* >( ecore_wl_display_get() );
-    }
-    else
-    {
-      mMainDisplay = AnyCast< WlDisplay* >( display );
-    }
+    mMainDisplay = AnyCast< WlDisplay* >( display );
   }
 }
 

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
index f70e3be..0120195 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
@@ -156,10 +156,10 @@ void DALI_TEST_EQUALS( const Matrix& matrix1, const Matrix& matrix2, const char*
   if (!identical)
   {
     fprintf(stderr, "%s, checking\n"
-               "(%f, %f, %f, %f)    (%f, %f, %f, %f)\n"
                "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n"
-               "(%f, %f, %f, %f)    (%f, %f, %f, %f)\n"
-               "(%f, %f, %f, %f)    (%f, %f, %f, %f)\n", location,
+               "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n"
+               "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n"
+               "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n", location,
                m1[0],  m1[1],  m1[2],  m1[3],   m2[0],  m2[1],  m2[2],  m2[3],
                m1[4],  m1[5],  m1[6],  m1[7],   m2[4],  m2[5],  m2[6],  m2[7],
                m1[8],  m1[9], m1[10], m1[11],   m2[8],  m2[9], m2[10], m2[11],
@@ -187,10 +187,10 @@ void DALI_TEST_EQUALS( const Matrix& matrix1, const Matrix& matrix2, float epsil
   if (!equivalent)
   {
     fprintf(stderr, "%s, checking\n"
-               "(%f, %f, %f, %f)    (%f, %f, %f, %f)\n"
                "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n"
-               "(%f, %f, %f, %f)    (%f, %f, %f, %f)\n"
-               "(%f, %f, %f, %f)    (%f, %f, %f, %f)\n", location,
+               "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n"
+               "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n"
+               "(%f, %f, %f, %f) == (%f, %f, %f, %f)\n", location,
                m1[0],  m1[1],  m1[2],  m1[3],   m2[0],  m2[1],  m2[2],  m2[3],
                m1[4],  m1[5],  m1[6],  m1[7],   m2[4],  m2[5],  m2[6],  m2[7],
                m1[8],  m1[9], m1[10], m1[11],   m2[8],  m2[9], m2[10], m2[11],
@@ -268,25 +268,11 @@ void DALI_TEST_GREATER( float value1, float value2, const char* location)
   }
 }
 
-/**
- * Test whether the assertion condition that failed and thus triggered the
- * exception \b e contained a given substring at the start of its literal text.
- * @param[in] e The exception that we expect was fired by a runtime assertion
- *              failure.
- * @param[in] conditionSubString The text that we expect to be present in an
- *                               assertion which triggered the exception.
- * @param[in] location The TEST_LOCATION macro should be used here.
- *
- * @remark **Side-effects:** The result of the tet test is set to TET_PASS if
- *         the substring is at the start of the exception's condition and
- *         TET_FAIL if it isn't. Note, if the result of a test is set multiple
- *         times, a TET_FAIL will override any number of TET_PASSes.
- */
 void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const char* location )
 {
-  if( 0u != e.mCondition.find( conditionSubString ))
+  if( NULL == strstr( e.condition, conditionSubString.c_str() ) )
   {
-    fprintf(stderr, "Assertion %s failed at %s\n", conditionSubString.c_str(), location);
+    fprintf(stderr, "Expected substring '%s' : actual exception string '%s' : location %s\n", conditionSubString.c_str(), e.condition, location );
     tet_result(TET_FAIL);
   }
   else
@@ -295,14 +281,6 @@ void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const c
   }
 }
 
-/** Self-documenting wrapper for DALI_TEST_ASSERT.
- * @copydoc DALI_TEST_ASSERT()
- */
-void DALI_TEST_ASSERT_CONDITION_STARTS_WITH_SUBSTRING( DaliException& exceptionFromAssertion, std::string conditionSubString, const char* location )
-{
-  DALI_TEST_ASSERT(exceptionFromAssertion, conditionSubString, location);
-}
-
 // Functor to test whether an Applied signal is emitted
 ConstraintAppliedCheck::ConstraintAppliedCheck( bool& signalReceived )
 : mSignalReceived( signalReceived )

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
index 375fb90..13db421 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
@@ -350,25 +350,22 @@ void DALI_TEST_GREATER( float value1, float value2, const char* location);
 
 /**
  * Test whether the assertion condition that failed and thus triggered the
- * exception \b e contained a given substring at the start of its literal text.
- * @param[in] e The exception that we expect was fired by a runtime assertion
- *              failure.
+ * exception \b e contained a given substring.
+ * @param[in] e The exception that we expect was fired by a runtime assertion failure.
  * @param[in] conditionSubString The text that we expect to be present in an
  *                               assertion which triggered the exception.
  * @param[in] location The TEST_LOCATION macro should be used here.
- *
- * @remark **Side-effects:** The result of the tet test is set to TET_PASS if
- *         the substring is at the start of the exception's condition and
- *         TET_FAIL if it isn't. Note, if the result of a test is set multiple
- *         times, a TET_FAIL will override any number of TET_PASSes.
  */
 void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const char* location );
 
-/** Self-documenting wrapper for DALI_TEST_ASSERT.
- * @copydoc DALI_TEST_ASSERT()
+/**
+ * Print the assert
+ * @param[in] e The exception that we expect was fired by a runtime assertion failure.
  */
-void DALI_TEST_ASSERT_CONDITION_STARTS_WITH_SUBSTRING( DaliException& exceptionFromAssertion, std::string conditionSubString, const char* location );
-
+inline void DALI_TEST_PRINT_ASSERT( DaliException& e )
+{
+  tet_printf("Assertion %s failed at %s\n", e.condition, e.location );
+}
 
 // Functor to test whether an Applied signal is emitted
 struct ConstraintAppliedCheck

diff --git a/platform-abstractions/slp/resource-loader/resource-thread-base.cpp b/platform-abstractions/slp/resource-loader/resource-thread-base.cpp
index 987c073..1708b24 100644 (file)
--- a/platform-abstractions/slp/resource-loader/resource-thread-base.cpp
+++ b/platform-abstractions/slp/resource-loader/resource-thread-base.cpp
@@ -220,7 +220,7 @@ void ResourceThreadBase::ThreadLoop()
     catch( Dali::DaliException& ex )
     {
       // Probably a failed assert-always:
-      DALI_LOG_ERROR( "DaliException caught in resource thread. Aborting request with id %u. Location: \"%s\". Condition: \"%s\".\n", unsigned(mCurrentRequestId), ex.mLocation.c_str(), ex.mCondition.c_str() );
+      DALI_LOG_ERROR( "DaliException caught in resource thread. Aborting request with id %u. Location: \"%s\". Condition: \"%s\".\n", unsigned(mCurrentRequestId), ex.location, ex.condition );
     }
     catch( ... )
     {