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

Conflicts:
	build/tizen/configure.ac
	packaging/dali-adaptor-mobile.spec
	packaging/dali-adaptor-tv.spec
	packaging/dali-adaptor-wearable.spec
	platform-abstractions/slp/font-platform/font-controller-impl.cpp
	platform-abstractions/slp/font-platform/font-controller-impl.h

Change-Id: I03f316eeadbe029c5872ee59042c4466b88430d7

diff --cc adaptors/common/object-profiler.cpp
Simple merge

diff --cc adaptors/common/style-monitor-impl.cpp
Simple merge

diff --cc adaptors/public-api/file.list
Simple merge

diff --cc build/tizen/adaptor/Makefile.am
index 6bff444,bce2054..532cd37
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -271,9 -255,9 +272,10 @@@ libdali_adaptor_la_LIBADD = 
                        $(SENSOR_LIBS) \
                        $(LIBDRM_LIBS) \
                        $(LIBEXIF_LIBS) \
+                       $(LIBCURL_LIBS) \
                        $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
                        $(CAPI_APPFW_APPLICATION_LIBS) \
 +                      $(HARFBUZZ_LIBS) \
                        -lgif \
                        -lboost_thread
  

diff --cc build/tizen/configure.ac
index e2cb0da,6aec94b..d7eab76
--- 1/build/tizen/configure.ac
--- 2/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@@ -44,8 -44,7 +44,9 @@@ PKG_CHECK_MODULES(PNG, libpng
  PKG_CHECK_MODULES(XML, libxml-2.0)
  PKG_CHECK_MODULES(LIBEXIF, libexif)
  PKG_CHECK_MODULES(LIBDRM, libdrm)
+ PKG_CHECK_MODULES(LIBCURL, libcurl)
 +PKG_CHECK_MODULES(HARFBUZZ, harfbuzz)
 +PKG_CHECK_MODULES(FRIBIDI, fribidi)
  
  # Check for availability of BulletPhysics
  PKG_CHECK_EXISTS(bullet, [

diff --cc packaging/dali-adaptor-mobile.spec
index 10b9c04,7f8de5c..6a46702
--- 1/packaging/dali-adaptor-mobile.spec
--- 2/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@@ -44,8 -44,7 +44,9 @@@ BuildRequires:  pkgconfig(capi-system-s
  BuildRequires:  pkgconfig(libpng)
  BuildRequires:  pkgconfig(opengl-es-20)
  BuildRequires:  pkgconfig(efl-assist)
+ BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)

diff --cc packaging/dali-adaptor-tv.spec
index 34f4262,ddf0543..33797c7
--- 1/packaging/dali-adaptor-tv.spec
--- 2/packaging/dali-adaptor-tv.spec
+++ b/packaging/dali-adaptor-tv.spec
@@@ -41,8 -41,7 +41,9 @@@ BuildRequires:  pkgconfig(xfixes
  BuildRequires:  pkgconfig(xdamage)
  BuildRequires:  pkgconfig(utilX)
  BuildRequires:  pkgconfig(gles20)
+ BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)

diff --cc packaging/dali-adaptor-wearable.spec
index 25724ea,bdaa536..d1e8464
--- 1/packaging/dali-adaptor-wearable.spec
--- 2/packaging/dali-adaptor-wearable.spec
+++ b/packaging/dali-adaptor-wearable.spec
@@@ -43,8 -43,7 +43,9 @@@ BuildRequires:  pkgconfig(capi-system-s
  BuildRequires:  pkgconfig(libpng)
  BuildRequires:  pkgconfig(gles20)
  BuildRequires:  pkgconfig(efl-assist)
+ BuildRequires:  libcurl-devel
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
  %if 0%{?dali_assimp_plugin}
  BuildRequires:  pkgconfig(assimp)

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

diff --cc platform-abstractions/slp/file.list
index bcc317a,2dab551..d303df1
--- 1/platform-abstractions/slp/file.list
--- 2/platform-abstractions/slp/file.list
+++ b/platform-abstractions/slp/file.list
@@@ -18,9 -21,10 +18,8 @@@ slp_platform_abstraction_src_files = 
    \
    $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-base.cpp \
    $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-image.cpp \
-   $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-distance-field.cpp \
    $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-model.cpp \
    $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-shader.cpp \
 -  $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-text.cpp \
    \
    $(slp_platform_abstraction_src_dir)/resource-loader/binary-model-builder.cpp \
    \