Merge "TextController - Update the text model." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / markup-processor.h

diff --git a/dali-toolkit/internal/text/markup-processor.h b/dali-toolkit/internal/text/markup-processor.h
index 86ec1a6..0c43300 100644 (file)
--- a/dali-toolkit/internal/text/markup-processor.h
+++ b/dali-toolkit/internal/text/markup-processor.h
@@ -19,8 +19,13 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
 #include <string>
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+
 namespace Dali
 {
 
@@ -35,11 +40,17 @@ namespace Text
  */
 struct MarkupProcessData
 {
-  MarkupProcessData()
-  : markupProcessedText()
+MarkupProcessData( Vector<ColorRun>& colorRuns,
+                   Vector<FontDescriptionRun>& fontRuns )
+  : colorRuns( colorRuns ),
+    fontRuns( fontRuns ),
+    markupProcessedText()
   {}
 
-  std::string markupProcessedText;
+  Vector<ColorRun>&           colorRuns;           ///< The color runs.
+  Vector<FontDescriptionRun>& fontRuns;            ///< The font description runs.
+
+  std::string                 markupProcessedText; ///< The mark-up string.
 };
 
 /**