Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	build/tizen/adaptor/Makefile.am
	platform-abstractions/slp/slp-platform-abstraction.cpp
	platform-abstractions/slp/slp-platform-abstraction.h

Change-Id: Ie98f87b62386114568d85bd23d87c909e18fe6b5

diff --cc adaptors/common/adaptor-impl.cpp
Simple merge

diff --cc adaptors/common/adaptor-impl.h
Simple merge

diff --cc adaptors/common/application-impl.cpp
Simple merge

diff --cc automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp
Simple merge

diff --cc automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
Simple merge

diff --cc build/tizen/adaptor/Makefile.am
index 532cd37,669376b..b5a128c
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -118,12 -109,15 +118,16 @@@ if MOBILE_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_mobile_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
-                              $(adaptor_x11_tizen_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
  
- endif
+ if WAYLAND
+ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
+ else
+ adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files)
+ endif # WAYLAND
  
+ endif # MOBILE_PROFILE
  
  # LITE
  if LITE_PROFILE
@@@ -141,10 -134,14 +145,15 @@@ if WEARABLE_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_mobile_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
-                              $(adaptor_x11_tizen_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
- endif
+ if WAYLAND
+ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
+ else
+ adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files)
+ endif # WAYLAND
+ 
+ endif # WEARABLE
  
  
  # TV
@@@ -152,9 -149,13 +161,14 @@@ if TV_PROFIL
  
  adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                               $(adaptor_common_internal_tv_profile_src_files) \
 -                             $(adaptor_tizen_internal_src_files)
 +                             $(adaptor_tizen_internal_src_files) \
-                              $(adaptor_x11_tv_internal_src_files) \
 +                             $(static_libraries_libunibreak_src_files)
+ if WAYLAND
+ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
+ else
+ adaptor_internal_src_files += $(adaptor_x11_tv_internal_src_files)
+ endif # WAYLAND
+ 
  endif
  
  # Feedback Plugin
@@@ -192,10 -192,7 +206,10 @@@ libdali_adaptor_la_includes = 
                        -I../../../adaptors/public-api \
                        -I../../../adaptors/public-api/adaptor-framework \
                        -I../../../adaptors/common \
 -                      -I../../../adaptors/
++                      -I../../../adaptors/ \
 +                      -I../../../text \
 +                      -I../../../text/dali/internal/libunibreak
 +
  if WAYLAND
  libdali_adaptor_la_includes += \
                        -I../../../adaptors/wayland

diff --cc build/tizen/configure.ac
Simple merge

diff --cc packaging/dali-adaptor-mobile.spec
Simple merge

diff --cc packaging/dali-adaptor-tv.spec
Simple merge

diff --cc packaging/dali-adaptor-wearable.spec
Simple merge

diff --cc packaging/dali-adaptor.spec
Simple merge

diff --cc platform-abstractions/slp/slp-platform-abstraction.cpp
index a674aed,799139f..d19d0f3
--- 1/platform-abstractions/slp/slp-platform-abstraction.cpp
--- 2/platform-abstractions/slp/slp-platform-abstraction.cpp
+++ b/platform-abstractions/slp/slp-platform-abstraction.cpp
@@@ -50,8 -66,14 +50,9 @@@ const unsigned int NANOSECS_TO_MICROSEC
  
  SlpPlatformAbstraction::SlpPlatformAbstraction()
  : mResourceLoader(new ResourceLoader),
-   mDynamicsFactory(NULL)
+   mDynamicsFactory(NULL),
 -  mDataStoragePath( "" ),
 -  mDefaultFontSize(FONT_SIZE_TABLE[1])
++  mDataStoragePath( "" )
  {
 -  int error = FT_Init_FreeType(&mFreeTypeHandle);
 -  DALI_ASSERT_ALWAYS( error == 0 && "Freetype initialization failed" );
 -
 -  UpdateDefaultsFromDevice();
  }
  
  SlpPlatformAbstraction::~SlpPlatformAbstraction()
@@@ -208,6 -373,104 +222,36 @@@ Integration::DynamicsFactory* SlpPlatfo
    return mDynamicsFactory;
  }
  
 -bool SlpPlatformAbstraction::ReadGlobalMetricsFromCache( const std::string& fontFamily,
 -                                                         const std::string& fontStyle,
 -                                                         Integration::GlobalMetrics& globalMetrics )
 -{
 -  return MetricsCache::ReadGlobal( fontFamily, fontStyle, globalMetrics );
 -}
 -
 -void SlpPlatformAbstraction::WriteGlobalMetricsToCache( const std::string& fontFamily,
 -                                                        const std::string& fontStyle,
 -                                                        const Integration::GlobalMetrics& globalMetrics )
 -{
 -  MetricsCache::WriteGlobal( fontFamily, fontStyle, globalMetrics);
 -}
 -
 -bool SlpPlatformAbstraction::ReadMetricsFromCache( const std::string& fontFamily,
 -                                                   const std::string& fontStyle,
 -                                                   std::vector<Integration::GlyphMetrics>& glyphMetricsContainer )
 -{
 -  return MetricsCache::Read( fontFamily, fontStyle, glyphMetricsContainer );
 -}
 -
 -void SlpPlatformAbstraction::WriteMetricsToCache( const std::string& fontFamily,
 -                                                  const std::string& fontStyle,
 -                                                  const Integration::GlyphSet& glyphSet )
 -{
 -  MetricsCache::Write( fontFamily, fontStyle, glyphSet );
 -}
 -
 -void SlpPlatformAbstraction::GetFileNamesFromDirectory( const std::string& directoryName,
 -                                                        std::vector<std::string>& fileNames )
 -{
 -  dirent* de = NULL;
 -  DIR* dp;
 -  dp = opendir( directoryName.c_str() );
 -  if( dp )
 -  {
 -    const std::string dot( "." );
 -    const std::string dotDot( ".." );
 -    while( true )
 -    {
 -      de = readdir( dp );
 -      if( de == NULL )
 -      {
 -        break;
 -      }
 -      const std::string fileName( de->d_name );
 -      if( ( fileName != dot ) &&
 -          ( fileName != dotDot ) )
 -      {
 -        fileNames.push_back( fileName );
 -      }
 -    }
 -    closedir( dp );
 -  }
 -}
 -
 -Integration::BitmapPtr SlpPlatformAbstraction::GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, const float fontSize, const uint32_t character ) const
 -{
 -  Integration::BitmapPtr glyphImage;
 -
 -  if( mResourceLoader )
 -  {
 -    glyphImage = mResourceLoader->GetGlyphImage( mFreeTypeHandle, fontFamily, fontStyle, fontSize, character );
 -  }
 -
 -  return glyphImage;
 -}
 -
+ bool SlpPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const
+ {
+   bool result = false;
+ 
+ #ifdef SHADERBIN_CACHE_ENABLED
+   std::string path;
+ 
+   if( mResourceLoader )
+   {
+     path = DALI_SHADERBIN_DIR;
+     path += filename;
+     result = mResourceLoader->LoadFile( path, buffer );
+   }
+ 
+   if( mResourceLoader && result == false )
+   {
+     path = mDataStoragePath;
+     path += filename;
+     result = mResourceLoader->LoadFile( path, buffer );
+   }
+ #endif
+ 
+   return result;
+ }
+ 
+ void SlpPlatformAbstraction::SetDataStoragePath( const std::string& path )
+ {
+   mDataStoragePath = path;
+ }
+ 
  }  // namespace SlpPlatform
  
  }  // namespace Dali

diff --cc platform-abstractions/slp/slp-platform-abstraction.h
index 3b1cea8,5201a0f..b27d9a7
--- 1/platform-abstractions/slp/slp-platform-abstraction.h
--- 2/platform-abstractions/slp/slp-platform-abstraction.h
+++ b/platform-abstractions/slp/slp-platform-abstraction.h
@@@ -147,9 -209,65 +147,21 @@@ public: // PlatformAbstraction override
     */
    virtual Integration::DynamicsFactory* GetDynamicsFactory();
  
 -   * @copydoc PlatformAbstraction::ReadGlobalMetricsFromCacheFile
 -   */
 -  virtual bool ReadGlobalMetricsFromCache( const std::string& fontFamily,
 -                                           const std::string& fontStyle,
 -                                           Integration::GlobalMetrics& globalMetrics );
 -
 -  /**
 -   * @copydoc PlatformAbstraction::WriteGlobalMetricsToCacheFile
 -   */
 -  virtual void WriteGlobalMetricsToCache( const std::string& fontFamily,
 -                                          const std::string& fontStyle,
 -                                          const Integration::GlobalMetrics& globalMetrics );
 -
 -  /**
 -   * @copydoc PlatformAbstraction::ReadMetricsFromCacheFile
 -   */
 -  virtual bool ReadMetricsFromCache( const std::string& fontFamily,
 -                                     const std::string& fontStyle,
 -                                     std::vector<Integration::GlyphMetrics>& glyphMetricsContainer );
 -
 -  /**
 -   * @copydoc PlatformAbstraction::WriteMetricsToCacheFile
 -   */
 -  virtual void WriteMetricsToCache( const std::string& fontFamily,
 -                                    const std::string& fontStyle,
 -                                    const Integration::GlyphSet& glyphSet );
 -
 -  /**
 -   * @copydoc PlatformAbstraction::GetFileNamesFromDirectory()
 -   */
 -  virtual void GetFileNamesFromDirectory( const std::string& directoryName,
 -                                          std::vector<std::string>& fileNames );
 -
 -  /**
 -   * @copydoc PlatformAbstraction::GetGlyphImage()
 -   */
 -  virtual Integration::BitmapPtr GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const;
 -
 -  /**
+   /**
+    * @copydoc PlatformAbstraction::LoadShaderBinFile()
+    */
+   virtual bool LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const;
+ 
+   /**
+    * Sets path for data/resource storage.
+    * @param[in] path data/resource storage path
+    */
+   void SetDataStoragePath( const std::string& path );
+ 
  private:
    ResourceLoader* mResourceLoader;
    DynamicsFactory* mDynamicsFactory;
 -  FT_Library mFreeTypeHandle;       ///< Freetype library
 -  std::string mDefaultFontFamily;
 -  std::string mDefaultFontStyle;
 -  std::string mDefaultThemeFile;
+   std::string mDataStoragePath;
 -  float mDefaultFontSize;
  };
  
  }  // namespace SlpPlatform