Merge "Added pixel format to fix bug with ktx loader" into devel/graphics

[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 fee7ae1..ec45957 100644 (file)
--- a/dali-toolkit/internal/text/markup-processor.h
+++ b/dali-toolkit/internal/text/markup-processor.h
@@ -23,9 +23,11 @@
 #include <string>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/anchor.h>
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/embedded-item.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/underlined-character-run.h>
 
 namespace Dali
 {
@@ -40,18 +42,24 @@ struct MarkupProcessData
 {
   MarkupProcessData(Vector<ColorRun>&           colorRuns,
                     Vector<FontDescriptionRun>& fontRuns,
-                    Vector<EmbeddedItem>&       items)
+                    Vector<EmbeddedItem>&       items,
+                    Vector<Anchor>&             anchors,
+                    Vector<UnderlinedCharacterRun>& underlinedCharacterRuns)
   : colorRuns(colorRuns),
     fontRuns(fontRuns),
     items(items),
+    anchors(anchors),
+    underlinedCharacterRuns(underlinedCharacterRuns),
     markupProcessedText()
   {
   }
 
-  Vector<ColorRun>&           colorRuns;           ///< The color runs.
-  Vector<FontDescriptionRun>& fontRuns;            ///< The font description runs.
-  Vector<EmbeddedItem>&       items;               ///< The embedded items.
-  std::string                 markupProcessedText; ///< The mark-up string.
+  Vector<ColorRun>&               colorRuns;               ///< The color runs.
+  Vector<FontDescriptionRun>&     fontRuns;                ///< The font description runs.
+  Vector<EmbeddedItem>&           items;                   ///< The embedded items.
+  Vector<Anchor>&                 anchors;                 ///< The anchors.
+  Vector<UnderlinedCharacterRun>& underlinedCharacterRuns; ///< The underlined character runs.
+  std::string                     markupProcessedText;     ///< The mark-up string.
 };
 
 /**