Merge "[3.0] Fix build error when using --enable-debug option" into tizen_3.0

[platform/core/uifw/dali-adaptor.git] / text / dali / internal / text-abstraction / font-client-impl.h

diff --git a/text/dali/internal/text-abstraction/font-client-impl.h b/text/dali/internal/text-abstraction/font-client-impl.h
index 18145c8..555fca8 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-impl.h
+++ b/text/dali/internal/text-abstraction/font-client-impl.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/text-abstraction/font-client.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
 
 namespace Dali
 {
@@ -66,10 +66,9 @@ public:
   void GetDpi( unsigned int& horizontalDpi, unsigned int& verticalDpi );
 
   /**
-   * @copydoc Dali::FontClient::SetDefaultFontFamily()
+   * @copydoc Dali::FontClient::ResetSystemDefaults()
    */
-  void SetDefaultFontFamily( const std::string& fontFamilyName,
-                             const std::string& fontStyle );
+  void ResetSystemDefaults();
 
   /**
    * @copydoc Dali::FontClient::GetDefaultFonts()
@@ -77,6 +76,11 @@ public:
   void GetDefaultFonts( FontList& defaultFonts );
 
   /**
+   * @copydoc Dali::FontClient::GetDefaultPlatformFontDescription()
+   */
+  void GetDefaultPlatformFontDescription( FontDescription& fontDescription );
+
+  /**
    * @copydoc Dali::FontClient::GetSystemFonts()
    */
   void GetSystemFonts( FontList& systemFonts );
@@ -94,30 +98,39 @@ public:
   /**
    * @copydoc Dali::FontClient::FindDefaultFont()
    */
-  FontId FindDefaultFont( Character charcode, PointSize26Dot6 pointSize, bool preferColor );
+  FontId FindDefaultFont( Character charcode,
+                          PointSize26Dot6 requestedPointSize,
+                          bool preferColor );
 
   /**
-   * @copydoc Dali::FontClient::GetFontId( const FontPath& path, PointSize26Dot6 pointSize, FaceIndex faceIndex )
+   * @copydoc Dali::FontClient::FindFallbackFont()
    */
-  FontId GetFontId( const FontPath& path, PointSize26Dot6 pointSize, FaceIndex faceIndex );
+  FontId FindFallbackFont( Character charcode,
+                           const FontDescription& preferredFontDescription,
+                           PointSize26Dot6 requestedPointSize,
+                           bool preferColor );
 
   /**
-   * @copydoc Dali::FontClient::GetFontId(const FontFamily& fontFamily, const FontStyle& fontStyle, PointSize26Dot6 pointSize, FaceIndex faceIndex )
+   * @copydoc Dali::FontClient::GetFontId( const FontPath& path, PointSize26Dot6 requestedPointSize, FaceIndex faceIndex )
    */
-  FontId GetFontId( const FontFamily& fontFamily,
-                    const FontStyle& fontStyle,
-                    PointSize26Dot6 pointSize,
+  FontId GetFontId( const FontPath& path, PointSize26Dot6 requestedPointSize, FaceIndex faceIndex );
+
+  /**
+   * @copydoc Dali::FontClient::GetFontId( const FontDescription& fontDescription, PointSize26Dot6 requestedPointSize, FaceIndex faceIndex )
+   */
+  FontId GetFontId( const FontDescription& fontDescription,
+                    PointSize26Dot6 requestedPointSize,
                     FaceIndex faceIndex );
 
   /**
-   * @copydoc Dali::FontClient::IsScalable(const FontPath& path )
+   * @copydoc Dali::FontClient::IsScalable( const FontPath& path )
    */
   bool IsScalable( const FontPath& path );
 
   /**
-   * @copydoc Dali::FontClient::IsScalable( const FontFamily& fontFamily, const FontStyle& fontStyle )
+   * @copydoc Dali::FontClient::IsScalable( const FontDescription& fontDescription )
    */
-  bool IsScalable( const FontFamily& fontFamily, const FontStyle& style );
+  bool IsScalable( const FontDescription& fontDescription );
 
   /**
    * @copydoc Dali::FontClient::GetFixedSizes( const FontPath& path, Dali::Vector< PointSize26Dot6>& sizes )
@@ -125,10 +138,9 @@ public:
   void GetFixedSizes( const FontPath& path, Dali::Vector< PointSize26Dot6>& sizes );
 
   /**
-   * @copydoc Dali::FontClient::GetFixedSizes( const FontFamily& fontFamily, const FontStyle& fontStyle, Dali::Vector< PointSize26Dot6>& sizes )
+   * @copydoc Dali::FontClient::GetFixedSizes()
    */
-  void GetFixedSizes( const FontFamily& fontFamily,
-                      const FontStyle& style,
+  void GetFixedSizes( const FontDescription& fontDescription,
                       Dali::Vector< PointSize26Dot6 >& sizes );
 
   /**
@@ -144,17 +156,22 @@ public:
   /**
    * @copydoc Dali::FontClient::GetGlyphMetrics()
    */
-  bool GetGlyphMetrics( GlyphInfo* array, uint32_t size, bool horizontal );
+  bool GetGlyphMetrics( GlyphInfo* array, uint32_t size, GlyphType type, bool horizontal );
 
   /**
    * @copydoc Dali::FontClient::CreateBitmap()
    */
-  BufferImage CreateBitmap( FontId fontId, GlyphIndex glyphIndex );
+  PixelData CreateBitmap( FontId fontId, GlyphIndex glyphIndex );
+
+  /**
+   * @copydoc Dali::FontClient::CreateVectorBlob()
+   */
+  void CreateVectorBlob( FontId fontId, GlyphIndex glyphIndex, VectorBlob*& blob, unsigned int& blobLength, unsigned int& nominalWidth, unsigned int& nominalHeight );
 
   /**
    * @copydoc Dali::FontClient::GetEllipsisGlyph()
    */
-  const GlyphInfo& GetEllipsisGlyph( PointSize26Dot6 pointSize );
+  const GlyphInfo& GetEllipsisGlyph( PointSize26Dot6 requestedPointSize );
 
 private:
 
@@ -167,7 +184,7 @@ private:
   FontClient( const FontClient& );
 
   // Undefined assignment constructor.
-  FontClient& operator=( FontClient& );
+  FontClient& operator=( const FontClient& );
 
 private: