[Tizen] Backport some font client issues

Change-Id: If12a5158663f29ead112edd6966e8bae39ee5f61
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>

diff --git a/dali/internal/text/text-abstraction/font-client-impl.cpp b/dali/internal/text/text-abstraction/font-client-impl.cpp
index af1257a..35d951c 100644 (file)
--- a/dali/internal/text/text-abstraction/font-client-impl.cpp
+++ b/dali/internal/text/text-abstraction/font-client-impl.cpp
@@ -110,6 +110,10 @@ Dali::TextAbstraction::FontClient FontClient::Get()
       else
       {
         fontClientHandle = Dali::TextAbstraction::FontClient(new FontClient);
+
+        // Make DefaultFontDescription cached
+        Dali::TextAbstraction::FontDescription defaultFontDescription;
+        fontClientHandle.GetDefaultPlatformFontDescription(defaultFontDescription);
       }
 
       gFontPreCacheAvailable = false;

diff --git a/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp b/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp
index 53d3d0f..02b9691 100644 (file)
--- a/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp
+++ b/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp
@@ -344,7 +344,7 @@ static hb_bool_t GlyphExtentsFunc(hb_font_t* font, void* font_data, hb_codepoint
 {
   // Output data stored here.
   GlyphCacheManager::GlyphCacheData glyphData;
-  if(!GetGlyphCacheData(font_data, static_cast<GlyphIndex>(glyphIndex), glyphData))
+  if(GetGlyphCacheData(font_data, static_cast<GlyphIndex>(glyphIndex), glyphData))
   {
     extents->x_bearing = glyphData.mGlyphMetrics.horiBearingX;
     extents->y_bearing = glyphData.mGlyphMetrics.horiBearingY;