X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmarkup-processor.h;h=e84b892afcb3e68d9743500bef871b44040cd3af;hp=c75ca0ce77e64c2b82cf6d316b42a4c2db5a2586;hb=93ad73e0e2c46aca4c191a1e2f075061e167e8b5;hpb=950447e00422e94e22ce64a69a13ebf1235b12c6

diff --git a/dali-toolkit/internal/text/markup-processor.h b/dali-toolkit/internal/text/markup-processor.h
index c75ca0c..e84b892 100644
--- a/dali-toolkit/internal/text/markup-processor.h
+++ b/dali-toolkit/internal/text/markup-processor.h
@@ -27,6 +27,7 @@
 #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
 {
@@ -39,23 +40,29 @@ namespace Text
  */
 struct MarkupProcessData
 {
-  MarkupProcessData(Vector<ColorRun>&           colorRuns,
-                    Vector<FontDescriptionRun>& fontRuns,
-                    Vector<EmbeddedItem>&       items,
-                    Vector<Anchor>&             anchors)
+  MarkupProcessData(Vector<ColorRun>&               colorRuns,
+                    Vector<FontDescriptionRun>&     fontRuns,
+                    Vector<EmbeddedItem>&           items,
+                    Vector<Anchor>&                 anchors,
+                    Vector<UnderlinedCharacterRun>& underlinedCharacterRuns,
+                    Vector<ColorRun>&               backgroundColorRuns)
   : colorRuns(colorRuns),
     fontRuns(fontRuns),
     items(items),
     anchors(anchors),
+    underlinedCharacterRuns(underlinedCharacterRuns),
+    backgroundColorRuns(backgroundColorRuns),
     markupProcessedText()
   {
   }
 
-  Vector<ColorRun>&           colorRuns;           ///< The color runs.
-  Vector<FontDescriptionRun>& fontRuns;            ///< The font description runs.
-  Vector<EmbeddedItem>&       items;               ///< The embedded items.
-  Vector<Anchor>&             anchors;             ///< The anchors.
-  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.
+  Vector<ColorRun>&               backgroundColorRuns;     ///< The background color runs.
+  std::string                     markupProcessedText;     ///< The mark-up string.
 };
 
 /**