[dali_2.0.21] Merge branch 'devel/master'

Change-Id: Ic7c5e94a830ba665d335b1648180161a94d9d204

diff --git a/dali-csharp-binder/src/accessible-impl-nui.cpp b/dali-csharp-binder/src/accessible-impl-nui.cpp
index d053ad8..9a29b9d 100644 (file)
--- a/dali-csharp-binder/src/accessible-impl-nui.cpp
+++ b/dali-csharp-binder/src/accessible-impl-nui.cpp
@@ -118,6 +118,22 @@ struct AccessibleImpl_NUI : public AccessibleImpl
         return ret;
     }
 
+    bool GrabHighlight() override
+    {
+        bool ret = AccessibleImpl::GrabHighlight();
+
+        if (ret)
+        {
+            // Note: Currently (2021-03-26), size negotiation between the default highlight frame
+            // and NUI Components is known to be broken (and possibly in other cases, too). Please
+            // remove this override for GrabHighlight() when it is fixed.
+            auto size = Self().GetProperty<Dali::Vector2>(Dali::Actor::Property::SIZE);
+            currentHighlightActor.GetHandle().SetProperty(Dali::Actor::Property::SIZE, size);
+        }
+
+        return ret;
+    }
+
     std::string GetActionName(std::size_t index) override
     {
         std::string ret{};
@@ -195,7 +211,7 @@ struct AccessibleImpl_NUI : public AccessibleImpl
 
     std::size_t GetChildCount() override
     {
-        bool highlighted = (self == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor());
+        bool highlighted = (Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor());
 
         if (ShouldReportZeroChildren())
         {
@@ -215,7 +231,7 @@ struct AccessibleImpl_NUI : public AccessibleImpl
 
     Dali::Accessibility::Accessible *GetChildAtIndex(std::size_t index) override
     {
-        bool highlighted = (self == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor());
+        bool highlighted = (Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor());
 
         if (ShouldReportZeroChildren())
         {

diff --git a/dali-csharp-binder/src/atspi.cpp b/dali-csharp-binder/src/atspi.cpp
index 68d9b1d..5fe4de8 100755 (executable)
--- a/dali-csharp-binder/src/atspi.cpp
+++ b/dali-csharp-binder/src/atspi.cpp
@@ -113,6 +113,22 @@ SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_pause_resume(void *jarg1,
   DALI_LOG_ERROR("csharp_dali_accessibility_pause_resume() arg2=%d", arg2);
 }
 
+SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_stop_reading(void *jarg1, bool jarg2)
+{
+  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1;
+  bool arg2 = jarg2;
+
+  if (!arg1)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control is null", 0);
+    return;
+  }
+
+  Dali::AtspiAccessibility::StopReading(arg2);
+
+  DALI_LOG_ERROR("csharp_dali_accessibility_stop_reading() arg2=%d", arg2);
+}
+
 SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_Enable(void *jarg1, bool jarg2)
 {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1;

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index b482c0c..64bbddd 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -25559,6 +25559,21 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Stage_IsInstalled() {
   return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetRenderTaskList(void * jarg1) {
+  void * jresult ;
+  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
+  Dali::RenderTaskList result;
+
+  arg1 = (Dali::Stage *)jarg1;
+  {
+    try {
+      result = ((Dali::Stage const *)arg1)->GetRenderTaskList();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::RenderTaskList((const Dali::RenderTaskList &)result);
+  return jresult;
+}
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetDpi(void * jarg1) {
   void * jresult ;

diff --git a/dali-csharp-binder/src/signal_wrap.cpp b/dali-csharp-binder/src/signal_wrap.cpp
index c13f0b2..7d73004 100644 (file)
--- a/dali-csharp-binder/src/signal_wrap.cpp
+++ b/dali-csharp-binder/src/signal_wrap.cpp
@@ -53,6 +53,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Disconnect(void *arg
     });
 }
 
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Emit(void *arg1, char *arg2) {
     GUARD_ON_NULL_RET(arg1);
     GUARD_ON_NULL_RET(arg2);
@@ -78,6 +79,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_delete(void *arg1) {
     });
 }
 
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Convert_Param1(void *arg1) {
     GUARD_ON_NULL_RET0(arg1);
     try_catch([&]() {
@@ -87,6 +89,24 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Convert_Param1(voi
     return nullptr;
 }
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_GetResult(void *arg1) {
+    GUARD_ON_NULL_RET0(arg1);
+    try_catch([&]() {
+        auto result = (std::string*)arg1;
+        return SWIG_csharp_string_callback(result->c_str());
+    });
+    return nullptr;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_SetResult(void *arg1, char *arg2) {
+    GUARD_ON_NULL_RET(arg1);
+    GUARD_ON_NULL_RET(arg2);
+    try_catch([&]() {
+        auto result = (std::string*)arg1;
+        (*result) = arg2;
+    });
+}
+
 /*
  * Implementation Signal <void(std::pair<Dali::Accessibility::GestureInfo, bool>&)> is used in signals:
  *     AccessibilityDoGestureSignalType

diff --git a/dali-csharp-binder/src/text-editor.cpp b/dali-csharp-binder/src/text-editor.cpp
index 1486741..70a8642 100755 (executable)
--- a/dali-csharp-binder/src/text-editor.cpp
+++ b/dali-csharp-binder/src/text-editor.cpp
@@ -1074,6 +1074,39 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_InputStyleChangedSignal(voi
 }
 
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_AnchorClickedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0 ;
+  Dali::Toolkit::DevelTextEditor::AnchorClickedSignalType *result = 0 ;
+
+  arg1 = (Dali::Toolkit::TextEditor *)jarg1;
+  {
+    try {
+      result = (Dali::Toolkit::DevelTextEditor::AnchorClickedSignalType *)&Dali::Toolkit::DevelTextEditor::AnchorClickedSignal(*arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextEditor_SelectWholeText(void * jarg1) {
   Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0;
 

diff --git a/dali-csharp-binder/src/text-field.cpp b/dali-csharp-binder/src/text-field.cpp
index f6334bd..5e3453c 100755 (executable)
--- a/dali-csharp-binder/src/text-field.cpp
+++ b/dali-csharp-binder/src/text-field.cpp
@@ -1048,6 +1048,39 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_InputStyleChangedSignal(void
 }
 
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_AnchorClickedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
+  Dali::Toolkit::DevelTextField::AnchorClickedSignalType *result = 0 ;
+
+  arg1 = (Dali::Toolkit::TextField *)jarg1;
+  {
+    try {
+      result = (Dali::Toolkit::DevelTextField::AnchorClickedSignalType *)&Dali::Toolkit::DevelTextField::AnchorClickedSignal(*arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextField_SelectWholeText(void * jarg1) {
   Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0;
 

diff --git a/dali-csharp-binder/src/text-label.cpp b/dali-csharp-binder/src/text-label.cpp
index 9dc5b40..dd1b329 100755 (executable)
--- a/dali-csharp-binder/src/text-label.cpp
+++ b/dali-csharp-binder/src/text-label.cpp
@@ -7,6 +7,22 @@
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
 
+SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Empty(Dali::Signal< void (Dali::Toolkit::TextLabel) > const *self){
+  return self->Empty();
+}
+SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__GetConnectionCount(Dali::Signal< void (Dali::Toolkit::TextLabel) > const *self){
+return self->GetConnectionCount();
+}
+SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Connect(Dali::Signal< void (Dali::Toolkit::TextLabel) > *self,void (*func)(Dali::Toolkit::TextLabel)){
+  self->Connect( func );
+}
+SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Disconnect(Dali::Signal< void (Dali::Toolkit::TextLabel) > *self,void (*func)(Dali::Toolkit::TextLabel)){
+  self->Disconnect( func );
+}
+SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Emit(Dali::Signal< void (Dali::Toolkit::TextLabel) > *self,Dali::Toolkit::TextLabel arg){
+  self->Emit( arg );
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -31,6 +47,263 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_FONT_SIZE_SCALE_get()
   return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_AnchorClickedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::TextLabel *arg1 = (Dali::Toolkit::TextLabel *) 0 ;
+  Dali::Toolkit::DevelTextLabel::AnchorClickedSignalType *result = 0 ;
+
+  arg1 = (Dali::Toolkit::TextLabel *)jarg1;
+  {
+    try {
+      result = (Dali::Toolkit::DevelTextLabel::AnchorClickedSignalType *)&Dali::Toolkit::DevelTextLabel::AnchorClickedSignal(*arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TextLabelSignal_Empty(void * jarg1) {
+  unsigned int jresult ;
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *) 0 ;
+  bool result;
+
+  arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)jarg1;
+  {
+    try {
+      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Empty((Dali::Signal< void (Dali::Toolkit::TextLabel) > const *)arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TextLabelSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *) 0 ;
+  std::size_t result;
+
+  arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)jarg1;
+  {
+    try {
+      result = Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Toolkit::TextLabel) > const *)arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = (unsigned long)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextLabelSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *) 0 ;
+  void (*arg2)(Dali::Toolkit::TextLabel) = (void (*)(Dali::Toolkit::TextLabel)) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)jarg1;
+  arg2 = (void (*)(Dali::Toolkit::TextLabel))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Connect(arg1,arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
+  }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextLabelSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *) 0 ;
+  void (*arg2)(Dali::Toolkit::TextLabel) = (void (*)(Dali::Toolkit::TextLabel)) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)jarg1;
+  arg2 = (void (*)(Dali::Toolkit::TextLabel))jarg2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Disconnect(arg1,arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
+  }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextLabelSignal_Emit(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *) 0 ;
+  Dali::Toolkit::TextLabel arg2 ;
+  Dali::Toolkit::TextLabel *argp2 ;
+
+  arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)jarg1;
+  argp2 = (Dali::Toolkit::TextLabel *)jarg2;
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Toolkit::TextLabel", 0);
+    return ;
+  }
+  arg2 = *argp2;
+  {
+    try {
+      Dali_Signal_Sl_void_Sp_Dali_Toolkit_TextLabel_SP__Sg__Emit(arg1,arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
+  }
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabelSignal() {
+  void * jresult ;
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *result = 0 ;
+
+  {
+    try {
+      result = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)new Dali::Signal< void (Dali::Toolkit::TextLabel) >();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextLabelSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Toolkit::TextLabel) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Toolkit::TextLabel) > *)jarg1;
+  {
+    try {
+      delete arg1;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return ;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+      };
+    }
+  }
+
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/src/web-view-signal-converter.h b/dali-csharp-binder/src/web-view-signal-converter.h
index 1aa2324..5a45ae3 100755 (executable)
--- a/dali-csharp-binder/src/web-view-signal-converter.h
+++ b/dali-csharp-binder/src/web-view-signal-converter.h
@@ -1,7 +1,7 @@
 #ifndef __DALI_CSHARP_BINDER_WEB_VIEW_SIGNAL_CONVERTER_H__
 #define __DALI_CSHARP_BINDER_WEB_VIEW_SIGNAL_CONVERTER_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.
@@ -18,8 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/signals/connection-tracker.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-view.h>
+#include <dali/public-api/signals/connection-tracker.h>
 
 /* Callback for returning strings to C# without leaking memory */
 typedef char* (SWIGSTDCALL* SWIG_CSharpStringHelperCallback)(const char*);
@@ -29,156 +29,101 @@ namespace SignalConverter
 {
 
 // Proxy class of WebViewPageLoadSignal.
-// WebViewPageLoadSignal has an argument of std::string type which is not supported at C# side.
-// The purpose of this class is to convert signal argument of string type safely.
+// WebViewPageLoadSignal has an argument of std::string type which is not
+// supported at C# side. The purpose of this class is to convert signal argument
+// of string type safely.
 class WebViewPageLoadSignal : public Dali::ConnectionTracker
 {
-
 public:
-  using NativeSignalType = Dali::Signal< void( Dali::Toolkit::WebView, const std::string& ) >;
-  using ProxySignalType = Dali::Signal< void( Dali::Toolkit::WebView, char* ) >;
-  using CallbackType = void ( * )( Dali::Toolkit::WebView, char* );
+  using NativeSignalType = Dali::Signal<void(Dali::Toolkit::WebView, const std::string&)>;
+  using ProxySignalType = Dali::Signal<void(Dali::Toolkit::WebView, char*)>;
+  using CallbackType = void (*)(Dali::Toolkit::WebView, char*);
 
-  WebViewPageLoadSignal( NativeSignalType* signal )
-    : mNativeSignalPtr( signal )
+  WebViewPageLoadSignal(NativeSignalType* signal) : mNativeSignalPtr(signal)
   {
   }
 
   ~WebViewPageLoadSignal()
   {
-    if( !mProxySignal.Empty() )
-    {
-      mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewPageLoadSignal::OnEmit );
-    }
-  }
-
-  void Connect( CallbackType csharpCallback )
-  {
-    if( mNativeSignalPtr->Empty())
-    {
-      mNativeSignalPtr->Connect( this, &SignalConverter::WebViewPageLoadSignal::OnEmit );
-    }
-    mProxySignal.Connect( csharpCallback );
-  }
-
-  void Disconnect( CallbackType csharpCallback )
-  {
-    mProxySignal.Disconnect( csharpCallback );
-    if( mProxySignal.Empty() )
-    {
-      mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewPageLoadSignal::OnEmit );
-    }
-  }
-
-  void OnEmit( Dali::Toolkit::WebView webview, const std::string& url )
-  {
-    // Safe string conversion
-    mProxySignal.Emit( webview, SWIG_csharp_string_callback( url.c_str() ) );
-  }
-
-private:
-
-  NativeSignalType* mNativeSignalPtr;
-  ProxySignalType   mProxySignal;
-};
-
-// Proxy class of WebViewPageLoadErrorSignal.
-// WebViewPageLoadSignal has an argument of std::string type which is not supported at C# side.
-// The purpose of this class is to convert signal argument of string type safely.
-class WebViewPageLoadErrorSignal : public Dali::ConnectionTracker
-{
-public:
-  using NativeSignalType = Dali::Signal< void( Dali::Toolkit::WebView, const std::string&, Dali::Toolkit::WebView::LoadErrorCode ) >;
-  using ProxySignalType = Dali::Signal< void( Dali::Toolkit::WebView, char*, int ) >;
-  using CallbackType = void ( * )( Dali::Toolkit::WebView, char*, int );
-
-  WebViewPageLoadErrorSignal( NativeSignalType* signal )
-    : mNativeSignalPtr( signal )
-  {
-  }
-
-  ~WebViewPageLoadErrorSignal()
-  {
-    if( !mProxySignal.Empty() )
+    if (!mProxySignal.Empty())
     {
-      mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewPageLoadErrorSignal::OnEmit );
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewPageLoadSignal::OnEmit);
     }
   }
 
-  void Connect( CallbackType csharpCallback )
+  void Connect(CallbackType csharpCallback)
   {
-    if( mNativeSignalPtr->Empty() )
+    if (mNativeSignalPtr->Empty())
     {
-      mNativeSignalPtr->Connect( this, &SignalConverter::WebViewPageLoadErrorSignal::OnEmit );
+      mNativeSignalPtr->Connect(this, &SignalConverter::WebViewPageLoadSignal::OnEmit);
     }
-    mProxySignal.Connect( csharpCallback );
+    mProxySignal.Connect(csharpCallback);
   }
 
-  void Disconnect( CallbackType csharpCallback )
+  void Disconnect(CallbackType csharpCallback)
   {
-    mProxySignal.Disconnect( csharpCallback );
-    if( mProxySignal.Empty() )
+    mProxySignal.Disconnect(csharpCallback);
+    if (mProxySignal.Empty())
     {
-      mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewPageLoadErrorSignal::OnEmit );
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewPageLoadSignal::OnEmit);
     }
   }
 
-  void OnEmit( Dali::Toolkit::WebView webview, const std::string& url, Dali::Toolkit::WebView::LoadErrorCode code )
+  void OnEmit(Dali::Toolkit::WebView webview, const std::string& url)
   {
     // Safe string conversion
-    mProxySignal.Emit( webview, SWIG_csharp_string_callback( url.c_str() ), static_cast<int>( code ) );
+    mProxySignal.Emit(webview, SWIG_csharp_string_callback(url.c_str()));
   }
 
 private:
-
-  NativeSignalType* mNativeSignalPtr;
-  ProxySignalType   mProxySignal;
+  NativeSignalType *mNativeSignalPtr;
+  ProxySignalType mProxySignal;
 };
 
 // Proxy class of WebViewScrollEdgeReachedSignal.
-// WebViewScrollEdgeReachedSignal has an argument of enum type which is not supported at C# side.
-// The purpose of this class is to convert signal argument of enum type safely.
+// WebViewScrollEdgeReachedSignal has an argument of enum type which is not
+// supported at C# side. The purpose of this class is to convert signal argument
+// of enum type safely.
 class WebViewScrollEdgeReachedSignal : public Dali::ConnectionTracker
 {
 public:
-  using NativeSignalType = Dali::Signal< void( Dali::Toolkit::WebView, Dali::WebEnginePlugin::ScrollEdge ) >;
-  using ProxySignalType = Dali::Signal< void( Dali::Toolkit::WebView, int ) >;
-  using CallbackType = void ( * )( Dali::Toolkit::WebView, int );
+  using NativeSignalType = Dali::Signal<void(Dali::Toolkit::WebView, Dali::WebEnginePlugin::ScrollEdge)>;
+  using ProxySignalType = Dali::Signal<void(Dali::Toolkit::WebView, int)>;
+  using CallbackType = void (*)(Dali::Toolkit::WebView, int);
 
-  WebViewScrollEdgeReachedSignal( NativeSignalType* signal )
-    : mNativeSignalPtr( signal )
+  WebViewScrollEdgeReachedSignal(NativeSignalType *signal) : mNativeSignalPtr(signal)
   {
   }
 
   ~WebViewScrollEdgeReachedSignal()
   {
-    if ( !mProxySignal.Empty() )
+    if (!mProxySignal.Empty())
     {
-       mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewScrollEdgeReachedSignal::OnEmit );
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewScrollEdgeReachedSignal::OnEmit);
     }
   }
 
-  void Connect( CallbackType csharpCallback )
+  void Connect(CallbackType csharpCallback)
   {
-    if ( mNativeSignalPtr->Empty() )
+    if (mNativeSignalPtr->Empty())
     {
-       mNativeSignalPtr->Connect( this, &SignalConverter::WebViewScrollEdgeReachedSignal::OnEmit );
+      mNativeSignalPtr->Connect(this, &SignalConverter::WebViewScrollEdgeReachedSignal::OnEmit);
     }
-    mProxySignal.Connect( csharpCallback );
+    mProxySignal.Connect(csharpCallback);
   }
 
-  void Disconnect( CallbackType csharpCallback )
+  void Disconnect(CallbackType csharpCallback)
   {
-    mProxySignal.Disconnect( csharpCallback );
-    if ( mProxySignal.Empty() )
+    mProxySignal.Disconnect(csharpCallback);
+    if (mProxySignal.Empty())
     {
-       mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewScrollEdgeReachedSignal::OnEmit );
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewScrollEdgeReachedSignal::OnEmit);
     }
   }
 
-  void OnEmit( Dali::Toolkit::WebView webview, Dali::WebEnginePlugin::ScrollEdge edge )
+  void OnEmit(Dali::Toolkit::WebView webview, Dali::WebEnginePlugin::ScrollEdge edge)
   {
-    mProxySignal.Emit( webview, static_cast< int >( edge ) );
+    mProxySignal.Emit(webview, static_cast<int>(edge));
   }
 
 private:
@@ -192,44 +137,44 @@ private:
 class WebViewUrlChangedSignal : public Dali::ConnectionTracker
 {
 public:
-  using NativeSignalType = Dali::Signal< void( Dali::Toolkit::WebView, const std::string& ) >;
-  using ProxySignalType = Dali::Signal< void( Dali::Toolkit::WebView, char* ) >;
-  using CallbackType = void ( * )( Dali::Toolkit::WebView, char* );
+  using NativeSignalType = Dali::Signal<void(Dali::Toolkit::WebView, const std::string&)>;
+  using ProxySignalType = Dali::Signal<void(Dali::Toolkit::WebView, char*)>;
+  using CallbackType = void (*)(Dali::Toolkit::WebView, char*);
 
-  WebViewUrlChangedSignal( NativeSignalType* signal )
+  WebViewUrlChangedSignal(NativeSignalType* signal)
     : mNativeSignalPtr(signal)
   {
   }
 
   ~WebViewUrlChangedSignal()
   {
-    if ( !mProxySignal.Empty() )
+    if (!mProxySignal.Empty())
     {
-      mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewUrlChangedSignal::OnEmit );
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewUrlChangedSignal::OnEmit);
     }
   }
 
-  void Connect( CallbackType csharpCallback )
+  void Connect(CallbackType csharpCallback)
   {
     if ( mNativeSignalPtr->Empty() )
     {
-      mNativeSignalPtr->Connect( this, &SignalConverter::WebViewUrlChangedSignal::OnEmit );
+      mNativeSignalPtr->Connect(this, &SignalConverter::WebViewUrlChangedSignal::OnEmit);
     }
-    mProxySignal.Connect( csharpCallback );
+    mProxySignal.Connect(csharpCallback);
   }
 
-  void Disconnect( CallbackType csharpCallback )
+  void Disconnect(CallbackType csharpCallback)
   {
-    mProxySignal.Disconnect( csharpCallback );
-    if ( mProxySignal.Empty() )
+    mProxySignal.Disconnect(csharpCallback);
+    if (mProxySignal.Empty())
     {
-      mNativeSignalPtr->Disconnect( this, &SignalConverter::WebViewUrlChangedSignal::OnEmit );
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewUrlChangedSignal::OnEmit);
     }
   }
 
-  void OnEmit( Dali::Toolkit::WebView webview, const std::string& url )
+  void OnEmit(Dali::Toolkit::WebView webview, const std::string& url)
   {
-    mProxySignal.Emit( webview, SWIG_csharp_string_callback( url.c_str() ) );
+    mProxySignal.Emit(webview, SWIG_csharp_string_callback(url.c_str()));
   }
 
 private:
@@ -237,26 +182,27 @@ private:
   ProxySignalType   mProxySignal;
 };
 
-// Proxy class of WebViewFormRepostDecisionSignal.
-// WebViewFormRepostDecisionSignal has an argument of std::shared_ptr type which is not supported at C# side.
+// Proxy template class of WebViewProxySignal with a std::shared_ptr argument.
+// WebViewProxySignal has an argument of std::shared_ptr type which is not supported at C# side.
 // The purpose of this class is to convert signal argument of std::shared_ptr type safely.
-class WebViewFormRepostDecisionSignal : public Dali::ConnectionTracker
+template <class SignalArgumentType>
+class WebViewProxySignal : public Dali::ConnectionTracker
 {
 public:
-  using NativeSignalType = Dali::Signal<void(Dali::Toolkit::WebView, std::shared_ptr<Dali::Toolkit::WebFormRepostDecision>)>;
-  using ProxySignalType = Dali::Signal<void(Dali::Toolkit::WebView, Dali::Toolkit::WebFormRepostDecision*)>;
-  using CallbackType = void (*)(Dali::Toolkit::WebView, Dali::Toolkit::WebFormRepostDecision*);
+  using NativeSignalType = Dali::Signal<void(Dali::Toolkit::WebView, std::shared_ptr<SignalArgumentType>)>;
+  using ProxySignalType = Dali::Signal<void(Dali::Toolkit::WebView, SignalArgumentType*)>;
+  using CallbackType = void (*)(Dali::Toolkit::WebView, SignalArgumentType*);
 
-  WebViewFormRepostDecisionSignal(NativeSignalType* signal)
+  WebViewProxySignal(NativeSignalType* signal)
     : mNativeSignalPtr(signal)
   {
   }
 
-  ~WebViewFormRepostDecisionSignal()
+  ~WebViewProxySignal()
   {
     if (!mProxySignal.Empty())
     {
-      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewFormRepostDecisionSignal::OnEmit);
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewProxySignal<SignalArgumentType>::OnEmit);
     }
   }
 
@@ -264,7 +210,7 @@ public:
   {
     if (mNativeSignalPtr->Empty())
     {
-      mNativeSignalPtr->Connect(this, &SignalConverter::WebViewFormRepostDecisionSignal::OnEmit);
+      mNativeSignalPtr->Connect(this, &SignalConverter::WebViewProxySignal<SignalArgumentType>::OnEmit);
     }
     mProxySignal.Connect(csharpCallback);
   }
@@ -274,20 +220,20 @@ public:
     mProxySignal.Disconnect(csharpCallback);
     if (mProxySignal.Empty())
     {
-      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewFormRepostDecisionSignal::OnEmit);
+      mNativeSignalPtr->Disconnect(this, &SignalConverter::WebViewProxySignal<SignalArgumentType>::OnEmit);
     }
   }
 
-  void OnEmit(Dali::Toolkit::WebView webview, std::shared_ptr<Dali::Toolkit::WebFormRepostDecision> decision)
+  void OnEmit(Dali::Toolkit::WebView webview, std::shared_ptr<SignalArgumentType> argument)
   {
-    mFormRepostDecision = std::move(decision);
-    mProxySignal.Emit(webview, mFormRepostDecision.get());
+    mArgumentSharedPtr = std::move(argument);
+    mProxySignal.Emit(webview, mArgumentSharedPtr.get());
   }
 
 private:
   NativeSignalType* mNativeSignalPtr;
   ProxySignalType   mProxySignal;
-  std::shared_ptr<Dali::Toolkit::WebFormRepostDecision> mFormRepostDecision;
+  std::shared_ptr<SignalArgumentType> mArgumentSharedPtr;
 };
 
 } // namespace SignalConverter

diff --git a/dali-csharp-binder/src/web-view.cpp b/dali-csharp-binder/src/web-view.cpp
index 041e4c1..df59ece 100755 (executable)
--- a/dali-csharp-binder/src/web-view.cpp
+++ b/dali-csharp-binder/src/web-view.cpp
@@ -23,13 +23,23 @@
 
 #include "web-view-signal-converter.h"
 
-#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list-item.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list-item.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-context.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-form-repost-decision.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-view.h>
+#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine-frame.h>
+#include <dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine-request-interceptor.h>
+#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
 #include <dali/public-api/common/dali-common.h>
 
 #define CALL_CATCH_EXCEPTION(ret)                                              \
@@ -51,7 +61,7 @@
   }
 
 /* Callback for returning strings to C# without leaking memory */
-typedef char *(SWIGSTDCALL *SWIG_CSharpStringHelperCallback)(const char *);
+typedef char *(SWIGSTDCALL *SWIG_CSharpStringHelperCallback)(const char*);
 extern SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback;
 
 #ifdef __cplusplus
@@ -68,7 +78,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebView_New() {
       result = Dali::Toolkit::WebView::New();
     } CALL_CATCH_EXCEPTION(0);
   }
-  jresult = new Dali::Toolkit::WebView((const Dali::Toolkit::WebView &)result);
+  jresult = new Dali::Toolkit::WebView((const Dali::Toolkit::WebView&)result);
   return jresult;
 }
 
@@ -99,7 +109,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebView_New_2(char * jarg1, char * jar
       result = Dali::Toolkit::WebView::New((std::string const &)*arg1, (std::string const &)*arg2);
     } CALL_CATCH_EXCEPTION(0);
   }
-  jresult = new Dali::Toolkit::WebView((const Dali::Toolkit::WebView &)result);
+  jresult = new Dali::Toolkit::WebView((const Dali::Toolkit::WebView&)result);
   return jresult;
 }
 
@@ -172,10 +182,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebView_Assign(void * jarg1, void * ja
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebView_DownCast(void * jarg1) {
   void * jresult;
   Dali::BaseHandle arg1;
-  Dali::BaseHandle *argp1;
+  Dali::BaseHandle* argp1;
   Dali::Toolkit::WebView result;
 
-  argp1 = (Dali::BaseHandle *)jarg1;
+  argp1 = (Dali::BaseHandle*)jarg1;
   if (!argp1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
     return 0;
@@ -186,7 +196,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebView_DownCast(void * jarg1) {
       result = Dali::Toolkit::WebView::DownCast(arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
-  jresult = new Dali::Toolkit::WebView((const Dali::Toolkit::WebView &)result);
+  jresult = new Dali::Toolkit::WebView((const Dali::Toolkit::WebView&)result);
   return jresult;
 }
 
@@ -438,9 +448,9 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebView_LoadContents(void * jarg1, const
   return result;
 }
 
-SWIGEXPORT const void *SWIGSTDCALL CSharp_Dali_WebView_GetFavicon(void * jarg1) {
-  Dali::Toolkit::WebView *arg1 = (Dali::Toolkit::WebView *)jarg1;
-  Dali::Toolkit::ImageView *result = 0;
+SWIGEXPORT const void * SWIGSTDCALL CSharp_Dali_WebView_GetFavicon(void * jarg1) {
+  Dali::Toolkit::WebView* arg1 = (Dali::Toolkit::WebView*)jarg1;
+  Dali::Toolkit::ImageView* result = 0;
   {
     try {
       result = (Dali::Toolkit::ImageView*)&(arg1)->GetFavicon();
@@ -570,8 +580,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebView_StopInspectorServer(void * jarg1
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_ScrollBy(void * jarg1, int jarg2, int jarg3) {
-  Dali::Toolkit::WebView *arg1 = (Dali::Toolkit::WebView *)0;
-
+  Dali::Toolkit::WebView* arg1 = (Dali::Toolkit::WebView*)0;
   arg1 = (Dali::Toolkit::WebView*)jarg1;
   {
     try {
@@ -674,7 +683,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_AddJavaScriptMessageHandler(void
 
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
   std::string exposedObjectName = jarg2;
-  void (*handler)(char *) = (void (*)(char *))jarg3;
+  void (*handler)(char*) = (void (*)(char*))jarg3;
 
   {
     try {
@@ -687,7 +696,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_AddJavaScriptMessageHandler(void
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_RegisterJavaScriptAlertCallback(void * jarg1, void * jarg2) {
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
-  bool (*handler)(char *) = (bool (*)(char *))jarg2;
+  bool (*handler)(char*) = (bool (*)(char*))jarg2;
   {
     try {
       webview->RegisterJavaScriptAlertCallback([handler](const std::string &message) -> bool {
@@ -708,7 +717,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_JavaScriptAlertReply(void * jarg
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_RegisterJavaScriptConfirmCallback(void * jarg1, void * jarg2) {
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
-  bool (*handler)(char *) = (bool (*)(char *))jarg2;
+  bool (*handler)(char*) = (bool (*)(char*))jarg2;
 
   {
     try {
@@ -730,7 +739,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_JavaScriptConfirmReply(void * ja
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_RegisterJavaScriptPromptCallback(void * jarg1, void * jarg2) {
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
-  bool (*handler)(char *, char *) = (bool (*)(char *, char *))jarg2;
+  bool (*handler)(char *, char*) = (bool (*)(char *, char*))jarg2;
 
   {
     try {
@@ -918,7 +927,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_ClearCookies(void * jarg1) {
 }
 
 SWIGEXPORT Dali::Toolkit::Control *SWIGSTDCALL CSharp_Dali_WebView_SWIGUpcast(Dali::Toolkit::WebView* jarg1) {
-  return (Dali::Toolkit::Control *)jarg1;
+  return (Dali::Toolkit::Control*)jarg1;
 }
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewPageLoadSignal_PageLoadStarted(void * jarg1) {
@@ -955,7 +964,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewPageLoadSignal_PageLoadFini
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewPageLoadSignal(void * jarg1) {
-  SignalConverter::WebViewPageLoadSignal *object = (SignalConverter::WebViewPageLoadSignal *)jarg1;
+  SignalConverter::WebViewPageLoadSignal *object = (SignalConverter::WebViewPageLoadSignal*)jarg1;
   {
     try {
       delete object;
@@ -964,7 +973,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewPageLoadSignal(void * jarg
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadSignal_Connect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewPageLoadSignal * proxy = (SignalConverter::WebViewPageLoadSignal *)jarg1;
+  SignalConverter::WebViewPageLoadSignal* proxy = (SignalConverter::WebViewPageLoadSignal*)jarg1;
   SignalConverter::WebViewPageLoadSignal::CallbackType callback = (SignalConverter::WebViewPageLoadSignal::CallbackType)jarg2;
   {
     try {
@@ -974,7 +983,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadSignal_Connect(void * jar
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadSignal_Disconnect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewPageLoadSignal * proxy = (SignalConverter::WebViewPageLoadSignal *)jarg1;
+  SignalConverter::WebViewPageLoadSignal* proxy = (SignalConverter::WebViewPageLoadSignal*)jarg1;
   SignalConverter::WebViewPageLoadSignal::CallbackType callback = (SignalConverter::WebViewPageLoadSignal::CallbackType)jarg2;
   {
     try {
@@ -983,19 +992,19 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadSignal_Disconnect(void *
   }
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewPageLoadErrorSignal_PageLoadError(void * jarg1) {
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_WebViewPageLoadErrorSignal_PageLoadError(void* jarg1) {
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
-  SignalConverter::WebViewPageLoadErrorSignal *result = 0;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>* result = 0;
   {
     try {
-      result = new SignalConverter::WebViewPageLoadErrorSignal(&webview->PageLoadErrorSignal());
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>(&webview->PageLoadErrorSignal());
     } CALL_CATCH_EXCEPTION(0);
   }
-  return (void *)result;
+  return (void*)result;
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewPageLoadErrorSignal(void * jarg1) {
-  SignalConverter::WebViewPageLoadErrorSignal *object = (SignalConverter::WebViewPageLoadErrorSignal *)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>*)jarg1;
   {
     try {
       delete object;
@@ -1004,8 +1013,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewPageLoadErrorSignal(void *
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadErrorSignal_Connect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewPageLoadErrorSignal *proxy = (SignalConverter::WebViewPageLoadErrorSignal *)jarg1;
-  SignalConverter::WebViewPageLoadErrorSignal::CallbackType callback = (SignalConverter::WebViewPageLoadErrorSignal::CallbackType)jarg2;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>::CallbackType)jarg2;
   {
     try {
       proxy->Connect(callback);
@@ -1014,8 +1023,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadErrorSignal_Connect(void
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadErrorSignal_Disconnect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewPageLoadErrorSignal *proxy = (SignalConverter::WebViewPageLoadErrorSignal *)jarg1;
-  SignalConverter::WebViewPageLoadErrorSignal::CallbackType callback = (SignalConverter::WebViewPageLoadErrorSignal::CallbackType)jarg2;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineLoadError>::CallbackType)jarg2;
   {
     try {
       proxy->Disconnect(callback);
@@ -1025,7 +1034,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPageLoadErrorSignal_Disconnect(vo
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewScrollEdgeReachedSignal_ScrollEdgeReached(void * jarg1) {
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
-  SignalConverter::WebViewScrollEdgeReachedSignal *result = 0;
+  SignalConverter::WebViewScrollEdgeReachedSignal* result = 0;
   {
     try {
       result = new SignalConverter::WebViewScrollEdgeReachedSignal(&webview->ScrollEdgeReachedSignal());
@@ -1035,7 +1044,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewScrollEdgeReachedSignal_Scr
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewScrollEdgeReachedSignal(void * jarg1) {
-  SignalConverter::WebViewScrollEdgeReachedSignal *object = (SignalConverter::WebViewScrollEdgeReachedSignal *)jarg1;
+  SignalConverter::WebViewScrollEdgeReachedSignal*object = (SignalConverter::WebViewScrollEdgeReachedSignal*)jarg1;
   {
     try {
       delete object;
@@ -1044,7 +1053,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewScrollEdgeReachedSignal(vo
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewScrollEdgeReachedSignal_Connect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewScrollEdgeReachedSignal *proxy = (SignalConverter::WebViewScrollEdgeReachedSignal *)jarg1;
+  SignalConverter::WebViewScrollEdgeReachedSignal* proxy = (SignalConverter::WebViewScrollEdgeReachedSignal*)jarg1;
   SignalConverter::WebViewScrollEdgeReachedSignal::CallbackType callback = (SignalConverter::WebViewScrollEdgeReachedSignal::CallbackType)jarg2;
   {
     try {
@@ -1054,7 +1063,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewScrollEdgeReachedSignal_Connect(v
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewScrollEdgeReachedSignal_Disconnect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewScrollEdgeReachedSignal *proxy = (SignalConverter::WebViewScrollEdgeReachedSignal *)jarg1;
+  SignalConverter::WebViewScrollEdgeReachedSignal* proxy = (SignalConverter::WebViewScrollEdgeReachedSignal*)jarg1;
   SignalConverter::WebViewScrollEdgeReachedSignal::CallbackType callback = (SignalConverter::WebViewScrollEdgeReachedSignal::CallbackType)jarg2;
   {
     try {
@@ -1075,7 +1084,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewUrlChangedSignal_UrlChanged
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewUrlChangedSignal(void * jarg1) {
-  SignalConverter::WebViewUrlChangedSignal *object = (SignalConverter::WebViewUrlChangedSignal *)jarg1;
+  SignalConverter::WebViewUrlChangedSignal* object = (SignalConverter::WebViewUrlChangedSignal*)jarg1;
   {
     try {
       delete object;
@@ -1084,7 +1093,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewUrlChangedSignal(void * ja
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewUrlChangedSignal_Connect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewUrlChangedSignal *proxy = (SignalConverter::WebViewUrlChangedSignal *)jarg1;
+  SignalConverter::WebViewUrlChangedSignal* proxy = (SignalConverter::WebViewUrlChangedSignal*)jarg1;
   SignalConverter::WebViewUrlChangedSignal::CallbackType callback = (SignalConverter::WebViewUrlChangedSignal::CallbackType)jarg2;
   {
     try {
@@ -1094,7 +1103,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewUrlChangedSignal_Connect(void * j
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewUrlChangedSignal_Disconnect(void * jarg1, void * jarg2) {
-  SignalConverter::WebViewUrlChangedSignal *proxy = (SignalConverter::WebViewUrlChangedSignal *)jarg1;
+  SignalConverter::WebViewUrlChangedSignal* proxy = (SignalConverter::WebViewUrlChangedSignal*)jarg1;
   SignalConverter::WebViewUrlChangedSignal::CallbackType callback = (SignalConverter::WebViewUrlChangedSignal::CallbackType)jarg2;
   {
     try {
@@ -1103,19 +1112,99 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewUrlChangedSignal_Disconnect(void
   }
 }
 
+SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_WebViewContextMenuCustomizedSignal_ContextMenuCustomized(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>* result = 0;
+  {
+    try {
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>(&webview->ContextMenuCustomizedSignal());
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void*)result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewContextMenuCustomizedSignal(void * jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>*)jarg1;
+  {
+    try {
+      delete object;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewContextMenuCustomizedSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>::CallbackType)jarg2;
+  {
+    try {
+      proxy->Connect(callback);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewContextMenuCustomizedSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenu>::CallbackType)jarg2;
+  {
+    try {
+      proxy->Disconnect(callback);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_WebViewContextMenuItemSelectedSignal_ContextMenuItemSelected(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>* result = 0;
+  {
+    try {
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>(&webview->ContextMenuItemSelectedSignal());
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void*)result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewContextMenuItemSelectedSignal(void * jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>*)jarg1;
+  {
+    try {
+      delete object;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewContextMenuItemSelectedSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>::CallbackType)jarg2;
+  {
+    try {
+      proxy->Connect(callback);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewContextMenuItemSelectedSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineContextMenuItem>::CallbackType)jarg2;
+  {
+    try {
+      proxy->Disconnect(callback);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_WebViewFormRepostDecisionSignal_FormRepostDecision(void* jarg1) {
   Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
-  SignalConverter::WebViewFormRepostDecisionSignal* result = 0;
+  SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>* result = 0;
   {
     try {
-      result = new SignalConverter::WebViewFormRepostDecisionSignal(&webview->FormRepostDecisionSignal());
+      result = new SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>(&webview->FormRepostDecisionSignal());
     } CALL_CATCH_EXCEPTION(0);
   }
   return (void*)result;
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewFormRepostDecisionSignal(void* jarg1) {
-  SignalConverter::WebViewFormRepostDecisionSignal* object = (SignalConverter::WebViewFormRepostDecisionSignal*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>* object = (SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>*)jarg1;
   {
     try {
       delete object;
@@ -1124,8 +1213,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewFormRepostDecisionSignal(v
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewFormRepostDecisionSignal_Connect(void* jarg1, void* jarg2) {
-  SignalConverter::WebViewFormRepostDecisionSignal* proxy = (SignalConverter::WebViewFormRepostDecisionSignal*)jarg1;
-  SignalConverter::WebViewFormRepostDecisionSignal::CallbackType callback = (SignalConverter::WebViewFormRepostDecisionSignal::CallbackType)jarg2;
+  SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>* proxy = (SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>::CallbackType)jarg2;
   {
     try {
       proxy->Connect(callback);
@@ -1134,8 +1223,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewFormRepostDecisionSignal_Connect(
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewFormRepostDecisionSignal_Disconnect(void* jarg1, void* jarg2) {
-  SignalConverter::WebViewFormRepostDecisionSignal* proxy = (SignalConverter::WebViewFormRepostDecisionSignal*)jarg1;
-  SignalConverter::WebViewFormRepostDecisionSignal::CallbackType callback = (SignalConverter::WebViewFormRepostDecisionSignal::CallbackType)jarg2;
+  SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>* proxy = (SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::Toolkit::WebFormRepostDecision>::CallbackType)jarg2;
   {
     try {
       proxy->Disconnect(callback);
@@ -1151,7 +1240,7 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_WebViewFrameRenderedSignal_FrameRendere
       result = (Dali::Toolkit::WebView::WebViewFrameRenderedSignalType*)(&(webview->FrameRenderedSignal()));
     } CALL_CATCH_EXCEPTION(0);
   }
-  return (void *)result;
+  return (void*)result;
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewFrameRenderedSignal_Connect(void* jarg1, void* jarg2) {
@@ -1174,256 +1263,1337 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewFrameRenderedSignal_Disconnect(vo
   }
 }
 
-//----------------------------------WebBackForwardList-----------------------------------------------------
-SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebBackForwardListItem_GetUrl(void * jarg1) {
-  Dali::Toolkit::WebBackForwardListItem *arg1 = (Dali::Toolkit::WebBackForwardListItem *)0;
-  std::string result;
-  arg1 = (Dali::Toolkit::WebBackForwardListItem *)jarg1;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewRequestInterceptorSignal_RequestInterceptor(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>* result = 0;
   {
     try {
-      result = arg1->GetUrl();
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>(&webview->RequestInterceptorSignal());
     } CALL_CATCH_EXCEPTION(0);
   }
-  char * jresult = SWIG_csharp_string_callback(result.c_str());
-  return jresult;
+  return (void*)result;
 }
 
-SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebBackForwardListItem_GetTitle(void * jarg1) {
-  Dali::Toolkit::WebBackForwardListItem *arg1 = (Dali::Toolkit::WebBackForwardListItem *)0;
-  std::string result;
-  arg1 = (Dali::Toolkit::WebBackForwardListItem *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewRequestInterceptorSignal(void* jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>*)jarg1;
   {
     try {
-      result = (arg1)->GetTitle();
-    } CALL_CATCH_EXCEPTION(0);
+      delete object;
+    } CALL_CATCH_EXCEPTION();
   }
-  char * jresult = SWIG_csharp_string_callback(result.c_str());
-  return jresult;
 }
 
-SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebBackForwardListItem_GetOriginalUrl(void * jarg1) {
-  Dali::Toolkit::WebBackForwardListItem *arg1 = (Dali::Toolkit::WebBackForwardListItem *)0;
-  std::string result;
-  arg1 = (Dali::Toolkit::WebBackForwardListItem *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewRequestInterceptorSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>::CallbackType)jarg2;
   {
     try {
-      result = (arg1)->GetOriginalUrl();
-    } CALL_CATCH_EXCEPTION(0);
+      proxy->Connect(callback);
+    } CALL_CATCH_EXCEPTION();
   }
-  char * jresult = SWIG_csharp_string_callback(result.c_str());
-  return jresult;
 }
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_WebBackForwardList_GetItemCount(void * jarg1) {
-  Dali::Toolkit::WebBackForwardList *arg1 = (Dali::Toolkit::WebBackForwardList *)0;
-  unsigned int result = 0;
-  arg1 = (Dali::Toolkit::WebBackForwardList *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewRequestInterceptorSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineRequestInterceptor>::CallbackType)jarg2;
   {
     try {
-      result = (arg1)->GetItemCount();
-    } CALL_CATCH_EXCEPTION(0);
+      proxy->Disconnect(callback);
+    } CALL_CATCH_EXCEPTION();
   }
-  return result;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebBackForwardList_GetCurrentItem(void * jarg1) {
-  Dali::Toolkit::WebBackForwardListItem *result = 0;
-  Dali::Toolkit::WebBackForwardList *arg1 =
-      (Dali::Toolkit::WebBackForwardList *)jarg1;
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_WebViewConsoleMessageSignal_ConsoleMessage(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>* result = 0;
   {
     try {
-      result = (arg1)->GetCurrentItem();
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>(&webview->ConsoleMessageSignal());
     } CALL_CATCH_EXCEPTION(0);
   }
-  return result;
+  return (void*)result;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebBackForwardList_GetItemAtIndex(void * jarg1, int jarg2) {
-  Dali::Toolkit::WebBackForwardListItem *result = 0;
-  Dali::Toolkit::WebBackForwardList *arg1 = (Dali::Toolkit::WebBackForwardList *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewConsoleMessageSignal(void * jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>*)jarg1;
   {
     try {
-      result = (arg1)->GetItemAtIndex(jarg2);
-    } CALL_CATCH_EXCEPTION(0);
+      delete object;
+    } CALL_CATCH_EXCEPTION();
   }
-  return result;
 }
 
-//----------------------------------WebContext-----------------------------------------------------
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebContext_GetCacheModel(void * jarg1) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-  int ret;
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewConsoleMessageSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>::CallbackType)jarg2;
   {
     try {
-      ret = (int)(arg1)->GetCacheModel();
-    } CALL_CATCH_EXCEPTION(0);
+      proxy->Connect(callback);
+    } CALL_CATCH_EXCEPTION();
   }
-  return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetCacheModel(void * jarg1, int jarg2) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewConsoleMessageSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineConsoleMessage>::CallbackType)jarg2;
   {
     try {
-      (arg1)->SetCacheModel((Dali::WebEngineContext::CacheModel)jarg2);
+      proxy->Disconnect(callback);
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetProxyUri(void * jarg1, const char * jarg2) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
-  std::string arg2_str(jarg2);
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WebViewCertificateSignal_CertificateConfirm(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>* result = 0;
   {
     try {
-      (arg1)->SetProxyUri(arg2_str);
-    } CALL_CATCH_EXCEPTION();
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>(&webview->CertificateConfirmSignal());
+    } CALL_CATCH_EXCEPTION(0);
   }
+  return (void*)result;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetCertificateFilePath(void * jarg1, const char * jarg2) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
-  std::string arg2_str(jarg2);
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_WebViewCertificateSignal_SslCertificateChanged(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>* result = 0;
   {
     try {
-      (arg1)->SetCertificateFilePath(arg2_str);
-    } CALL_CATCH_EXCEPTION();
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>(&webview->SslCertificateChangedSignal());
+    } CALL_CATCH_EXCEPTION(0);
   }
+  return (void*)result;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DisableCache(void * jarg1, bool jarg2) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewCertificateSignal(void * jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>*)jarg1;
   {
     try {
-      (arg1)->DisableCache(jarg2);
+      delete object;
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetDefaultProxyAuth(
-    void * jarg1, const char * jarg2, const char * jarg3) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
-  std::string arg2_str(jarg2);
-  std::string arg3_str(jarg3);
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewCertificateSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>::CallbackType)jarg2;
   {
     try {
-      (arg1)->SetDefaultProxyAuth(arg2_str, arg3_str);
+      proxy->Connect(callback);
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DeleteWebDatabase(void * jarg1) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewCertificateSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineCertificate>::CallbackType)jarg2;
   {
     try {
-      (arg1)->DeleteWebDatabase();
+      proxy->Disconnect(callback);
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DeleteWebStorage(void * jarg1) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_WebViewPolicyDecisionSignal_PolicyDecision(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>* result = 0;
+  {
+    try {
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>(&webview->PolicyDecisionSignal());
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void*)result;
+}
 
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewPolicyDecisionSignal(void * jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>* object = (SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>*)jarg1;
   {
     try {
-      (arg1)->DeleteWebStorage();
+      delete object;
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DeleteLocalFileSystem(void * jarg1) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPolicyDecisionSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>::CallbackType)jarg2;
   {
     try {
-      (arg1)->DeleteLocalFileSystem();
+      proxy->Connect(callback);
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_ClearCache(void * jarg1) {
-  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
-
-  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewPolicyDecisionSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEnginePolicyDecision>::CallbackType)jarg2;
   {
     try {
-      (arg1)->ClearCache();
+      proxy->Disconnect(callback);
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-//----------------------------------WebCookieManager---------------------------------------------------
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebCookieManager_GetCookieAcceptPolicy(void * jarg1) {
-  Dali::Toolkit::WebCookieManager *arg1 = (Dali::Toolkit::WebCookieManager *)0;
-  int ret;
-
-  arg1 = (Dali::Toolkit::WebCookieManager *)jarg1;
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_WebViewHttpAuthHandlerSignal_HttpAuthHandler(void * jarg1) {
+  Dali::Toolkit::WebView* webview = (Dali::Toolkit::WebView*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>* result = 0;
   {
     try {
-      ret = (int)(arg1)->GetCookieAcceptPolicy();
+      result = new SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>(&webview->HttpAuthHandlerSignal());
     } CALL_CATCH_EXCEPTION(0);
   }
-  return ret;
+  return (void*)result;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCookieManager_SetCookieAcceptPolicy(void * jarg1, int jarg2) {
-  Dali::Toolkit::WebCookieManager *arg1 = (Dali::Toolkit::WebCookieManager *)0;
-
-  arg1 = (Dali::Toolkit::WebCookieManager *)jarg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebViewHttpAuthHandlerSignal(void * jarg1) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>* object = (SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>*)jarg1;
   {
     try {
-      (arg1)->SetCookieAcceptPolicy(
-          (Dali::WebEngineCookieManager::CookieAcceptPolicy)jarg2);
+      delete object;
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCookieManager_SetPersistentStorage(void * jarg1, const char * jarg2, int jarg3) {
-  Dali::Toolkit::WebCookieManager *arg1 = (Dali::Toolkit::WebCookieManager *)0;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewHttpAuthHandlerSignal_Connect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>::CallbackType)jarg2;
+  {
+    try {
+      proxy->Connect(callback);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
 
-  arg1 = (Dali::Toolkit::WebCookieManager *)jarg1;
-  std::string arg2_str(jarg2);
-  Dali::WebEngineCookieManager::CookiePersistentStorage arg3_enum = (Dali::WebEngineCookieManager::CookiePersistentStorage)jarg3;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebViewHttpAuthHandlerSignal_Disconnect(void * jarg1, void * jarg2) {
+  SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>* proxy = (SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>*)jarg1;
+  SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>::CallbackType callback = (SignalConverter::WebViewProxySignal<Dali::WebEngineHttpAuthHandler>::CallbackType)jarg2;
   {
     try {
-      (arg1)->SetPersistentStorage(arg2_str, arg3_enum);
+      proxy->Disconnect(callback);
     } CALL_CATCH_EXCEPTION();
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCookieManager_ClearCookies(void * jarg1) {
-  Dali::Toolkit::WebCookieManager *arg1 = (Dali::Toolkit::WebCookieManager *)0;
+//----------------------------------WebBackForwardList-----------------------------------------------------
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebBackForwardListItem_GetUrl(void * jarg1) {
+  Dali::Toolkit::WebBackForwardListItem *arg1 = (Dali::Toolkit::WebBackForwardListItem *)0;
+  std::string result;
+  arg1 = (Dali::Toolkit::WebBackForwardListItem *)jarg1;
+  {
+    try {
+      result = arg1->GetUrl();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char * jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
 
-  arg1 = (Dali::Toolkit::WebCookieManager *)jarg1;
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebBackForwardListItem_GetTitle(void * jarg1) {
+  Dali::Toolkit::WebBackForwardListItem *arg1 = (Dali::Toolkit::WebBackForwardListItem *)0;
+  std::string result;
+  arg1 = (Dali::Toolkit::WebBackForwardListItem *)jarg1;
   {
     try {
-      (arg1)->ClearCookies();
-    } CALL_CATCH_EXCEPTION();
+      result = (arg1)->GetTitle();
+    } CALL_CATCH_EXCEPTION(0);
   }
+  char * jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
 }
 
-//----------------------------------WebFormRepostDecision---------------------------------------------------
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebFormRepostDecision_Reply(void *jarg1, bool jarg2) {
-  Dali::Toolkit::WebFormRepostDecision* arg1 = (Dali::Toolkit::WebFormRepostDecision*)jarg1;
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebBackForwardListItem_GetOriginalUrl(void * jarg1) {
+  Dali::Toolkit::WebBackForwardListItem *arg1 = (Dali::Toolkit::WebBackForwardListItem *)0;
+  std::string result;
+  arg1 = (Dali::Toolkit::WebBackForwardListItem *)jarg1;
   {
     try {
-      arg1->Reply(jarg2);
-    } CALL_CATCH_EXCEPTION();
+      result = (arg1)->GetOriginalUrl();
+    } CALL_CATCH_EXCEPTION(0);
   }
+  char * jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_WebBackForwardList_GetItemCount(void * jarg1) {
+  Dali::Toolkit::WebBackForwardList *arg1 = (Dali::Toolkit::WebBackForwardList *)0;
+  unsigned int result = 0;
+  arg1 = (Dali::Toolkit::WebBackForwardList *)jarg1;
+  {
+    try {
+      result = (arg1)->GetItemCount();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebBackForwardList_GetCurrentItem(void * jarg1) {
+  Dali::Toolkit::WebBackForwardListItem *result = 0;
+  Dali::Toolkit::WebBackForwardList *arg1 = (Dali::Toolkit::WebBackForwardList *)jarg1;
+  {
+    try {
+      result = (arg1)->GetCurrentItem();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebBackForwardList_GetItemAtIndex(void * jarg1, int jarg2) {
+  Dali::Toolkit::WebBackForwardListItem *result = 0;
+  Dali::Toolkit::WebBackForwardList *arg1 = (Dali::Toolkit::WebBackForwardList *)jarg1;
+  {
+    try {
+      result = (arg1)->GetItemAtIndex(jarg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebConsoleMessage-----------------------------------------------------
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebConsoleMessage_GetSource(void* jarg1) {
+  Dali::WebEngineConsoleMessage* arg1 = (Dali::WebEngineConsoleMessage*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetSource();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_WebConsoleMessage_GetLine(void* jarg1) {
+  Dali::WebEngineConsoleMessage* arg1 = (Dali::WebEngineConsoleMessage*)jarg1;
+  uint32_t result;
+  {
+    try {
+      result = arg1->GetLine();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebConsoleMessage_GetSeverityLevel(void* jarg1) {
+  Dali::WebEngineConsoleMessage* arg1 = (Dali::WebEngineConsoleMessage*)jarg1;
+  int result;
+  {
+    try {
+      result = (int)arg1->GetSeverityLevel();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebConsoleMessage_GetText(void* jarg1) {
+  Dali::WebEngineConsoleMessage* arg1 = (Dali::WebEngineConsoleMessage*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetText();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+//----------------------------------WebCertificate-----------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCertificate_Allow(void * jarg1, bool jarg2) {
+  Dali::WebEngineCertificate *arg1 = (Dali::WebEngineCertificate*)jarg1;
+  {
+    try {
+      (arg1)->Allow(jarg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebCertificate_IsFromMainFrame(void * jarg1) {
+  Dali::WebEngineCertificate* arg1 = (Dali::WebEngineCertificate*)jarg1;
+  bool ret;
+  {
+    try {
+      ret = (arg1)->IsFromMainFrame();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT const char *SWIGSTDCALL CSharp_Dali_WebCertificate_GetPem(void * jarg1) {
+  Dali::WebEngineCertificate* arg1 = (Dali::WebEngineCertificate*)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetPem();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char *jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebCertificate_IsContextSecure(void * jarg1) {
+  Dali::WebEngineCertificate* arg1 = (Dali::WebEngineCertificate*)jarg1;
+  bool ret;
+  {
+    try {
+      ret = (arg1)->IsContextSecure();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+//----------------------------------WebContext-----------------------------------------------------
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebContext_GetCacheModel(void * jarg1) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+  int ret;
+  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      ret = (int)(arg1)->GetCacheModel();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetCacheModel(void * jarg1, int jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+
+  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      (arg1)->SetCacheModel((Dali::WebEngineContext::CacheModel)jarg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetProxyUri(void * jarg1, const char * jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+
+  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  std::string arg2_str(jarg2);
+  {
+    try {
+      (arg1)->SetProxyUri(arg2_str);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetCertificateFilePath(void * jarg1, const char * jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+
+  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  std::string arg2_str(jarg2);
+  {
+    try {
+      (arg1)->SetCertificateFilePath(arg2_str);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DisableCache(void * jarg1, bool jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+
+  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      (arg1)->DisableCache(jarg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_SetDefaultProxyAuth(void * jarg1, const char * jarg2, const char * jarg3) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  std::string arg2_str(jarg2);
+  std::string arg3_str(jarg3);
+  {
+    try {
+      (arg1)->SetDefaultProxyAuth(arg2_str, arg3_str);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DeleteAllWebDatabase(void *jarg1) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      (arg1)->DeleteAllWebDatabase();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContext_GetWebDatabaseOrigins(void *jarg1, void *jarg2) {
+  Dali::Toolkit::WebContext * arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  void (*handler)(std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*) = (void (*)(std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*))jarg2;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->GetWebDatabaseOrigins(
+                 [handler](std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>& originList) {
+                    std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>* webOriginList = new std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>();
+                    webOriginList->swap(originList);
+                    handler(webOriginList);
+                 });
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContext_DeleteWebDatabase(void *jarg1, void *jarg2) {
+  Dali::Toolkit::WebContext * arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  Dali::WebEngineSecurityOrigin * origin = (Dali::WebEngineSecurityOrigin *)jarg2;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->DeleteWebDatabase(*origin);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContext_GetWebStorageOrigins(void *jarg1, void *jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  void (*handler)(std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*) = (void (*)(std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*))jarg2;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->GetWebStorageOrigins(
+                 [handler](std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>& originList) {
+                    std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>* contextOriginList = new std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>();
+                    contextOriginList->swap(originList);
+                    handler(contextOriginList);
+                 });
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContext_GetWebStorageUsageForOrigin(void *jarg1, void *jarg2, void *jarg3) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  Dali::WebEngineSecurityOrigin *origin = (Dali::WebEngineSecurityOrigin *)jarg2;
+  void (*callback)(uint64_t) = (void (*)(uint64_t))jarg3;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->GetWebStorageUsageForOrigin(*origin, callback);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DeleteAllWebStorage(void *jarg1) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)0;
+
+  arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      (arg1)->DeleteAllWebStorage();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContext_DeleteWebStorageOrigin(void *jarg1, void *jarg2) {
+  Dali::Toolkit::WebContext * arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  Dali::WebEngineSecurityOrigin * origin = (Dali::WebEngineSecurityOrigin *)jarg2;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->DeleteWebStorageOrigin(*origin);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_DeleteLocalFileSystem(void *jarg1) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      (arg1)->DeleteLocalFileSystem();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_ClearCache(void * jarg1) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  {
+    try {
+      (arg1)->ClearCache();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContext_DeleteApplicationCache(void * jarg1, void * jarg2) {
+  Dali::Toolkit::WebContext * arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  Dali::WebEngineSecurityOrigin * origin = (Dali::WebEngineSecurityOrigin *)jarg2;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->DeleteApplicationCache(*origin);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_GetFormPasswordList(void *jarg1, void *jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  void (*handler)(std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>*) = (void (*)(std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>*))jarg2;
+  {
+    try {
+      (arg1)->GetFormPasswordList(
+                 [handler](std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>& passwordList) {
+                    std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>* contextPasswordList = new std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>();
+                    contextPasswordList->swap(passwordList);
+                    handler(contextPasswordList);
+                 });
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_RegisterDownloadStartedCallback(void * jarg1, void * jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  void (*handler)(char *) = (void (*)(char *))jarg2;
+  {
+    try {
+      (arg1)->RegisterDownloadStartedCallback(
+                 [handler](const std::string& url) {
+                   handler(SWIG_csharp_string_callback(url.c_str()));
+                 });
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebContext_RegisterMimeOverriddenCallback(void *jarg1, void *jarg2) {
+  Dali::Toolkit::WebContext *arg1 = (Dali::Toolkit::WebContext *)jarg1;
+  bool (*handler)(char *, char *, char *) = (bool (*)(char *, char *, char *))jarg2;
+  {
+    try {
+      (arg1)->RegisterMimeOverriddenCallback(
+          [handler](const std::string& url, const std::string& mime, std::string& newMime) -> bool {
+            return handler(SWIG_csharp_string_callback(url.c_str()),
+                           SWIG_csharp_string_callback(mime.c_str()),
+                           SWIG_csharp_string_callback(newMime.c_str()));
+          });
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+//----------------------------------WebContextMenu---------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebContextMenu(void * jarg1) {
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "WebContextMenu is null", 0);
+    return;
+  }
+
+  Dali::WebEngineContextMenu* arg1 = (Dali::WebEngineContextMenu*)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_WebContextMenu_GetItemCount(void *jarg1) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  uint32_t ret;
+  {
+    try {
+      ret = (arg1)->GetItemCount();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebContextMenu_GetItemAt(void *jarg1, uint32_t jarg2) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  Dali::WebEngineContextMenuItem *result = 0;
+  {
+    try {
+      std::unique_ptr<Dali::WebEngineContextMenuItem> item = (arg1)->GetItemAt(jarg2);
+      result = item.release();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void *)result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebContextMenu_GetItemList(void *jarg1) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>* result = nullptr;
+  {
+    try {
+      result = new std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>();
+      std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>> itemList = (arg1)->GetItemList();
+      result->swap(itemList);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void *)result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebContextMenu_GetPosition(void * jarg1) {
+  Dali::WebEngineContextMenu* arg1 = (Dali::WebEngineContextMenu*)jarg1;
+  Dali::Vector2 result;
+  {
+    try {
+      result = (arg1)->GetPosition();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void *)new Dali::Vector2((const Dali::Vector2&)result);
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContextMenu_RemoveItem(void *jarg1, void *jarg2) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  bool result = 0;
+  {
+    try {
+      result = (arg1)->RemoveItem(*((Dali::WebEngineContextMenuItem*)jarg2));
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContextMenu_AppendItemAsAction(void *jarg1, int jarg2, const char *jarg3, bool jarg4) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  bool result = 0;
+  {
+    try {
+      result = (arg1)->AppendItemAsAction((Dali::WebEngineContextMenuItem::ItemTag)jarg2, jarg3, jarg4);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContextMenu_AppendItem(void *jarg1, int jarg2, const char *jarg3, const char *jarg4, bool jarg5) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  bool result = 0;
+  {
+    try {
+      result = (arg1)->AppendItem((Dali::WebEngineContextMenuItem::ItemTag)jarg2, jarg3, jarg4, jarg5);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContextMenu_SelectItem(void *jarg1, void *jarg2) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  bool result = 0;
+  {
+    try {
+      result = (arg1)->SelectItem(*((Dali::WebEngineContextMenuItem*)jarg2));
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContextMenu_Hide(void *jarg1) {
+  Dali::WebEngineContextMenu *arg1 = (Dali::WebEngineContextMenu *)jarg1;
+  bool result = 0;
+  {
+    try {
+      result = (arg1)->Hide();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebContextMenuItem---------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebContextMenuItem(void * jarg1) {
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "WebContextMenuItem is null", 0);
+    return;
+  }
+
+  Dali::WebEngineContextMenuItem* arg1 = (Dali::WebEngineContextMenuItem*)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebContextMenuItem_GetTag(void *jarg1) {
+  Dali::WebEngineContextMenuItem *arg1 = (Dali::WebEngineContextMenuItem *)jarg1;
+  int result = 0;
+  {
+    try {
+      result = (int)(arg1)->GetTag();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebContextMenuItem_GetType(void *jarg1) {
+  Dali::WebEngineContextMenuItem *arg1 = (Dali::WebEngineContextMenuItem *)jarg1;
+  int result = 0;
+  {
+    try {
+      result = (int)(arg1)->GetType();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebContextMenuItem_IsEnabled(void *jarg1) {
+  Dali::WebEngineContextMenuItem *arg1 = (Dali::WebEngineContextMenuItem *)jarg1;
+  bool result = 0;
+  {
+    try {
+      result = (arg1)->IsEnabled();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebContextMenuItem_GetLinkUrl(void *jarg1) {
+  Dali::WebEngineContextMenuItem *arg1 = (Dali::WebEngineContextMenuItem *)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetLinkUrl();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char *jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebContextMenuItem_GetImageUrl(void *jarg1) {
+  Dali::WebEngineContextMenuItem *arg1 = (Dali::WebEngineContextMenuItem *)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetImageUrl();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char *jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebContextMenuItem_GetTitle(void *jarg1) {
+  Dali::WebEngineContextMenuItem *arg1 = (Dali::WebEngineContextMenuItem *)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetTitle();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char *jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebContextMenuItem_GetParentMenu(void *jarg1) {
+  Dali::WebEngineContextMenuItem* arg1 = (Dali::WebEngineContextMenuItem*)jarg1;
+  Dali::WebEngineContextMenu* result = 0;
+  {
+    try {
+      std::unique_ptr<Dali::WebEngineContextMenu> item = (arg1)->GetParentMenu();
+      result = item.release();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return (void *)result;
+}
+
+//----------------------------------WebContextMenuItemList---------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebContextMenu_ItemList(void * jarg1) {
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "WebContextMenu ItemList is null", 0);
+    return;
+  }
+
+  std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>*)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_WebContextMenu_ItemList_GetItemCount(void* jarg1) {
+  std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>*)jarg1;
+  uint32_t result = 0;
+  {
+    try {
+      result = (arg1)->size();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebContextMenu_ItemList_ValueOfIndex(void* jarg1, unsigned int jarg2) {
+  std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineContextMenuItem>>*)jarg1;
+  Dali::WebEngineContextMenuItem* result = 0;
+  {
+    try {
+      result = ((arg1)->operator[](jarg2)).get();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebCookieManager---------------------------------------------------
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebCookieManager_GetCookieAcceptPolicy(void * jarg1) {
+  Dali::Toolkit::WebCookieManager* arg1 = (Dali::Toolkit::WebCookieManager*)0;
+  int ret;
+
+  arg1 = (Dali::Toolkit::WebCookieManager*)jarg1;
+  {
+    try {
+      ret = (int)(arg1)->GetCookieAcceptPolicy();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCookieManager_SetCookieAcceptPolicy(void * jarg1, int jarg2) {
+  Dali::Toolkit::WebCookieManager* arg1 = (Dali::Toolkit::WebCookieManager*)0;
+  arg1 = (Dali::Toolkit::WebCookieManager*)jarg1;
+  {
+    try {
+      (arg1)->SetCookieAcceptPolicy(
+          (Dali::WebEngineCookieManager::CookieAcceptPolicy)jarg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCookieManager_SetPersistentStorage(void * jarg1, const char * jarg2, int jarg3) {
+  Dali::Toolkit::WebCookieManager* arg1 = (Dali::Toolkit::WebCookieManager*)0;
+
+  arg1 = (Dali::Toolkit::WebCookieManager*)jarg1;
+  std::string arg2_str(jarg2);
+  Dali::WebEngineCookieManager::CookiePersistentStorage arg3_enum = (Dali::WebEngineCookieManager::CookiePersistentStorage)jarg3;
+  {
+    try {
+      (arg1)->SetPersistentStorage(arg2_str, arg3_enum);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebCookieManager_ClearCookies(void * jarg1) {
+  Dali::Toolkit::WebCookieManager* arg1 = (Dali::Toolkit::WebCookieManager*)0;
+
+  arg1 = (Dali::Toolkit::WebCookieManager*)jarg1;
+  {
+    try {
+      (arg1)->ClearCookies();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+//----------------------------------WebFormRepostDecision---------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebFormRepostDecision_Reply(void *jarg1, bool jarg2) {
+  Dali::Toolkit::WebFormRepostDecision* arg1 = (Dali::Toolkit::WebFormRepostDecision*)jarg1;
+  {
+    try {
+      arg1->Reply(jarg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+//----------------------------------WebFrame---------------------------------------------------
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebFrame_IsMainFrame(void* jarg1) {
+  Dali::WebEngineFrame* arg1 = (Dali::WebEngineFrame*)jarg1;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->IsMainFrame();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebPolicyDecision-----------------------------------------------------
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetUrl(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetUrl();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetCookie(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetCookie();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetDecisionType(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  int result;
+  {
+    try {
+      result = (int)arg1->GetDecisionType();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetResponseMime(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetResponseMime();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetResponseStatusCode(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  int result;
+  {
+    try {
+      result = arg1->GetResponseStatusCode();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetNavigationType(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  int result;
+  {
+    try {
+      result = (int)arg1->GetNavigationType();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetFrame(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  Dali::WebEngineFrame* result = 0;
+  {
+    try {
+      result = &((arg1)->GetFrame());
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebPolicyDecision_GetScheme(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetScheme();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebPolicyDecision_Use(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  bool result;
+  {
+    try {
+      result = arg1->Use();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebPolicyDecision_Ignore(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  bool result;
+  {
+    try {
+      result = arg1->Ignore();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebPolicyDecision_Suspend(void* jarg1) {
+  Dali::WebEnginePolicyDecision* arg1 = (Dali::WebEnginePolicyDecision*)jarg1;
+  bool result;
+  {
+    try {
+      result = arg1->Suspend();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebRequestInterceptor---------------------------------------------------
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebRequestInterceptor_GetUrl(void * jarg1) {
+  Dali::WebEngineRequestInterceptor* arg1 = (Dali::WebEngineRequestInterceptor*)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetUrl();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebRequestInterceptor_Ignore(void * jarg1) {
+  Dali::WebEngineRequestInterceptor* arg1 = (Dali::WebEngineRequestInterceptor*)jarg1;
+  bool ret = false;
+  {
+    try {
+      ret = (arg1)->Ignore();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebRequestInterceptor_SetResponseStatus(void * jarg1, int jarg2, const char *jarg3) {
+  Dali::WebEngineRequestInterceptor* arg1 = (Dali::WebEngineRequestInterceptor*)jarg1;
+  bool ret = false;
+  std::string arg3_str(jarg3);
+  {
+    try {
+      ret = (arg1)->SetResponseStatus(jarg2, arg3_str);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebRequestInterceptor_AddResponseHeader(void * jarg1, const char *jarg2, const char *jarg3) {
+  Dali::WebEngineRequestInterceptor* arg1 = (Dali::WebEngineRequestInterceptor*)jarg1;
+  bool ret = false;
+  std::string arg2_str(jarg2);
+  std::string arg3_str(jarg3);
+  {
+    try {
+      ret = (arg1)->AddResponseHeader(arg2_str, arg3_str);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebRequestInterceptor_AddResponseBody(void * jarg1, const char *jarg2, uint32_t length) {
+  Dali::WebEngineRequestInterceptor* arg1 = (Dali::WebEngineRequestInterceptor*)jarg1;
+  bool ret = false;
+  std::string arg2_str(jarg2);
+  {
+    try {
+      ret = (arg1)->AddResponseBody(arg2_str, length);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return ret;
+}
+
+//----------------------------------WebHttpAuthHandler---------------------------------------------------
+SWIGEXPORT const char *SWIGSTDCALL CSharp_Dali_WebHttpAuthHandler_GetRealm(void * jarg1) {
+  Dali::WebEngineHttpAuthHandler* arg1 = (Dali::WebEngineHttpAuthHandler*)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetRealm();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char *jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebHttpAuthHandler_Suspend(void * jarg1) {
+  Dali::WebEngineHttpAuthHandler* arg1 = (Dali::WebEngineHttpAuthHandler*)jarg1;
+  {
+    try {
+      (arg1)->Suspend();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebHttpAuthHandler_UseCredential(
+    void * jarg1, const char *jarg2, const char *jarg3) {
+  Dali::WebEngineHttpAuthHandler* arg1 = (Dali::WebEngineHttpAuthHandler*)jarg1;
+  std::string arg2_str(jarg2);
+  std::string arg3_str(jarg3);
+  {
+    try {
+      (arg1)->UseCredential(arg2_str, arg3_str);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebHttpAuthHandler_CancelCredential(void * jarg1) {
+  Dali::WebEngineHttpAuthHandler* arg1 = (Dali::WebEngineHttpAuthHandler*)jarg1;
+  {
+    try {
+      (arg1)->CancelCredential();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+//----------------------------------WebPasswordData---------------------------------------------------
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebPasswordData_GetUrl(void * jarg1) {
+  Dali::WebEngineContext::PasswordData *arg1 = (Dali::WebEngineContext::PasswordData *)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->url;
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char * jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebPasswordData_GetUseFingerprint(void * jarg1) {
+  Dali::WebEngineContext::PasswordData * arg1 = (Dali::WebEngineContext::PasswordData *)jarg1;
+  bool result = false;
+  {
+    try {
+      result = (arg1)->useFingerprint;
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebLoadError-----------------------------------------------------
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebLoadError_GetUrl(void* jarg1) {
+  Dali::WebEngineLoadError* arg1 = (Dali::WebEngineLoadError*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetUrl();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebLoadError_GetCode(void* jarg1) {
+  Dali::WebEngineLoadError* arg1 = (Dali::WebEngineLoadError*)jarg1;
+  int result;
+  {
+    try {
+      result = (int)arg1->GetCode();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT const char* SWIGSTDCALL CSharp_Dali_WebLoadError_GetDescription(void* jarg1) {
+  Dali::WebEngineLoadError* arg1 = (Dali::WebEngineLoadError*)jarg1;
+  std::string result;
+  {
+    try {
+      result = arg1->GetDescription();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char* jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WebLoadError_GetType(void* jarg1) {
+  Dali::WebEngineLoadError* arg1 = (Dali::WebEngineLoadError*)jarg1;
+  int result;
+  {
+    try {
+      result = (int)arg1->GetType();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+//----------------------------------WebPasswordDataList---------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebPasswordDataList(void * jarg1) {
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "WebEngineContext::PasswordData List is null", 0);
+    return;
+  }
+
+  std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>*)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_WebPasswordDataList_GetItemCount(void* jarg1) {
+  std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>*)jarg1;
+  uint32_t result = 0;
+  {
+    try {
+      result = (arg1)->size();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebPasswordDataList_ValueOfIndex(void * jarg1, unsigned int jarg2) {
+  std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>>*)jarg1;
+  Dali::WebEngineContext::PasswordData* result = 0;
+  {
+    try {
+      result = ((arg1)->operator[](jarg2)).get();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+//----------------------------------WebSecurityOrigin---------------------------------------------------
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebSecurityOrigin_GetHost(void * jarg1) {
+  Dali::WebEngineSecurityOrigin *arg1 = (Dali::WebEngineSecurityOrigin *)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetHost();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char * jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+SWIGEXPORT const char * SWIGSTDCALL CSharp_Dali_WebSecurityOrigin_GetProtocol(void * jarg1) {
+  Dali::WebEngineSecurityOrigin *arg1 = (Dali::WebEngineSecurityOrigin *)jarg1;
+  std::string result;
+  {
+    try {
+      result = (arg1)->GetProtocol();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  char * jresult = SWIG_csharp_string_callback(result.c_str());
+  return jresult;
+}
+
+//----------------------------------WebSecurityOriginList---------------------------------------------------
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WebSecurityOriginList(void *jarg1) {
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "WebEngineSecurityOrigin List is null", 0);
+    return;
+  }
+
+  std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_WebSecurityOriginList_GetItemCount(void* jarg1) {
+  std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*)jarg1;
+  uint32_t result = 0;
+  {
+    try {
+      result = (arg1)->size();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  return result;
+}
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WebSecurityOriginList_ValueOfIndex(void *jarg1, unsigned int jarg2) {
+  std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>* arg1 = (std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>*)jarg1;
+  Dali::WebEngineSecurityOrigin * result = 0;
+  {
+    try {
+      result = ((arg1)->operator[](jarg2)).get();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
 }
 
 //----------------------------------WebSettings---------------------------------------------------
@@ -1484,7 +2654,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableWebSecurity(void * jar
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableCacheBuilder(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableCacheBuilder(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1495,7 +2665,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableCacheBuilder(void* jar
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_UseScrollbarThumbFocusNotifications(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_UseScrollbarThumbFocusNotifications(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1506,7 +2676,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_UseScrollbarThumbFocusNotifi
   }
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableDoNotTrack(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableDoNotTrack(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1565,7 +2735,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsAutoFittingEnabled(void *
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableAutoFitting(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableAutoFitting(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1589,7 +2759,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_ArePluginsEnabled(void * jar
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnablePlugins(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnablePlugins(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1613,7 +2783,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsPrivateBrowsingEnabled(voi
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnablePrivateBrowsing(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnablePrivateBrowsing(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1637,7 +2807,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsLinkMagnifierEnabled(void
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableLinkMagnifier(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableLinkMagnifier(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1661,7 +2831,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsKeypadWithoutUserActionUse
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_UseKeypadWithoutUserAction(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_UseKeypadWithoutUserAction(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1685,7 +2855,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsAutofillPasswordFormEnable
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableAutofillPasswordForm(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableAutofillPasswordForm(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1709,7 +2879,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsFormCandidateDataEnabled(v
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableFormCandidateData(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableFormCandidateData(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1733,7 +2903,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsTextSelectionEnabled(void
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableTextSelection(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableTextSelection(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1757,7 +2927,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsTextAutosizingEnabled(void
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableTextAutosizing(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableTextAutosizing(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1781,7 +2951,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsArrowScrollEnabled(void *
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableArrowScroll(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableArrowScroll(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1805,7 +2975,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsClipboardEnabled(void * ja
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableClipboard(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableClipboard(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;
@@ -1829,7 +2999,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WebSettings_IsImePanelEnabled(void * jar
   return ret;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableImePanel(void* jarg1, bool jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebSettings_EnableImePanel(void * jarg1, bool jarg2) {
   Dali::Toolkit::WebSettings* arg1 = (Dali::Toolkit::WebSettings*) 0;
 
   arg1 = (Dali::Toolkit::WebSettings*)jarg1;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 3fe49e0..9e9bcb5 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali2-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 2.0.20
+Version: 2.0.21
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT