Merge "Add an API for getting web view when request is intercepted." into devel/master

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 6609ae5..6313fc9 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -630,7 +630,7 @@ MESSAGE( STATUS "Use pkg configure:             " ${ENABLE_PKG_CONFIGURE} )
 MESSAGE( STATUS "Vector Based Text Rendering:   " ${ENABLE_VECTOR_BASED_TEXT_RENDERING} )
 MESSAGE( STATUS "Enable link test:              " ${ENABLE_LINK_TEST} )
 MESSAGE( STATUS "Configure automated tests:     " ${CONFIGURE_AUTOMATED_TESTS} )
-MESSAGE( STATUS "Build Dali Scene3D:       " ${BUILD_SCENE3D} )
+MESSAGE( STATUS "Build Dali Scene3D:            " ${BUILD_SCENE3D} )
 MESSAGE( STATUS "CXXFLAGS:                      " ${CMAKE_CXX_FLAGS} )
 MESSAGE( STATUS "LDFLAGS:                       " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )
 

diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
index 7303324..9672929 100644 (file)
--- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
+++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES\r
 #include <dali/public-api/actors/layer.h>\r
 #include <dali/public-api/animation/animation.h>\r
+#include <dali/public-api/common/vector-wrapper.h>\r
 #include <dali/public-api/rendering/renderer.h>\r
 #include <dali/public-api/rendering/shader.h>\r
 \r

diff --git a/dali-toolkit/internal/transition/transition-impl.h b/dali-toolkit/internal/transition/transition-impl.h
index 7230e2b..22cc01f 100644 (file)
--- a/dali-toolkit/internal/transition/transition-impl.h
+++ b/dali-toolkit/internal/transition/transition-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -24,6 +24,7 @@
 #include <dali-toolkit/public-api/transition/transition.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/weak-handle.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/transition/transition-set-impl.h b/dali-toolkit/internal/transition/transition-set-impl.h
index eb9962d..b980a46 100644 (file)
--- a/dali-toolkit/internal/transition/transition-set-impl.h
+++ b/dali-toolkit/internal/transition/transition-set-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_SET_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -24,6 +24,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/processor-interface.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/signals/connection-tracker.h>
 

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 9ae5216..a38b173 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -29,7 +29,7 @@ namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
 const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 32;
+const unsigned int TOOLKIT_MICRO_VERSION = 34;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/dali-toolkit/shader-generator/shader-generator.cpp b/dali-toolkit/shader-generator/shader-generator.cpp
index d386fb3..16cddcc 100644 (file)
--- a/dali-toolkit/shader-generator/shader-generator.cpp
+++ b/dali-toolkit/shader-generator/shader-generator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -144,11 +144,24 @@ void GenerateHeaderFile(
             << endl;
     outFile << "const std::string_view " << shaderVariableName << endl;
     outFile << "{" << endl;
+
+    // Using Raw String Literal to generate shader files as this will simplify the file layout.
+    // And it will fix some compilation warnings about missing terminating strings.
+    // Note : we should skip empty headline to guarantee that "#version ~~~" as top of shader code.
+    outFile << "R\"(";
     string line;
+    bool   firstLinePrinted = false;
     while(getline(shaderFile, line))
     {
-      outFile << "\"" << line << "\\n\"" << endl;
+      if(!firstLinePrinted && line.find_first_not_of(" \t\r\n") == std::string::npos)
+      {
+        // Empty string occured!
+        continue;
+      }
+      firstLinePrinted = true;
+      outFile << line << endl;
     }
+    outFile << ")\"" << endl;
     outFile << "};" << endl;
     cout << " [OK]" << endl;
   }

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 5caa1e1..c80cb6b 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.1.32
+Version:    2.1.34
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT