Merge "Add some APIs into web context." 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
old mode 100755 (executable)
new mode 100644 (file)
index de66e7f..c75ca0c
--- a/dali-toolkit/internal/text/markup-processor.h
+++ b/dali-toolkit/internal/text/markup-processor.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,36 +23,38 @@
 #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>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 /**
  * @brief Keeps the plain text and references to vectors from the model which stores runs with text styles.
  */
 struct MarkupProcessData
 {
-MarkupProcessData( Vector<ColorRun>& colorRuns,
-                   Vector<FontDescriptionRun>& fontRuns,
-                   Vector<EmbeddedItem>& items )
-  : colorRuns( colorRuns ),
-    fontRuns( fontRuns ),
+  MarkupProcessData(Vector<ColorRun>&           colorRuns,
+                    Vector<FontDescriptionRun>& fontRuns,
+                    Vector<EmbeddedItem>&       items,
+                    Vector<Anchor>&             anchors)
+  : colorRuns(colorRuns),
+    fontRuns(fontRuns),
     items(items),
+    anchors(anchors),
     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.
 };
 
@@ -62,7 +64,7 @@ MarkupProcessData( Vector<ColorRun>& colorRuns,
  * @param[in] markupString The mark-up string.
  * @param[out] markupProcessData The plain text and the style.
  */
-void ProcessMarkupString( const std::string& markupString, MarkupProcessData& markupProcessData );
+void ProcessMarkupString(const std::string& markupString, MarkupProcessData& markupProcessData);
 
 } // namespace Text