(Web Engine) Moved Devel Headers into sub-folder to improve SAM score

Change-Id: I3650e7e060585904fe4b65aefb59b3e18bf755f2

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 92b74a4..8b0cb56 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -278,6 +278,7 @@ SET( tizenadaptorintegrationapidir ${INCLUDE_DIR}/dali/integration-api/adaptor-f
 SET( tizenadaptorframeworkpublicapidir ${tizenadaptorpublicapidir}/adaptor-framework )
 SET( tizenadaptorframeworkdevelapidir ${tizenadaptordevelapidir}/adaptor-framework )
 SET( tizencanvasrendererdevelapidir ${tizenadaptorframeworkdevelapidir}/canvas-renderer )
+SET( tizenwebenginedevelapidir ${tizenadaptorframeworkdevelapidir}/web-engine )
 SET( tizenatspiinterfacesdevelapidir ${tizenadaptordevelapidir}/atspi-interfaces )
 SET( tizentextabstractiondevelapidir ${tizenadaptordevelapidir}/text-abstraction )
 SET( tizenadaptordaliheaderdir ${INCLUDE_DIR}/dali )
@@ -293,6 +294,7 @@ INSTALL( FILES ${adaptor_integration_api_header_files} DESTINATION ${tizenadapto
 INSTALL( FILES ${public_api_adaptor_framework_header_files} DESTINATION ${tizenadaptorframeworkpublicapidir} )
 INSTALL( FILES ${devel_api_adaptor_framework_header_files} DESTINATION ${tizenadaptorframeworkdevelapidir} )
 INSTALL( FILES ${devel_api_adaptor_framework_canvas_renderer_header_files} DESTINATION ${tizencanvasrendererdevelapidir} )
+INSTALL( FILES ${devel_api_adaptor_framework_web_engine_header_files} DESTINATION ${tizenwebenginedevelapidir} )
 INSTALL( FILES ${devel_api_atspi_interfaces_header_files} DESTINATION ${tizenatspiinterfacesdevelapidir} )
 INSTALL( FILES ${text_abstraction_header_files} DESTINATION ${tizentextabstractiondevelapidir} )
 

diff --git a/dali/devel-api/adaptor-framework/web-engine-back-forward-list-item.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list-item.h
similarity index 97%
rename from dali/devel-api/adaptor-framework/web-engine-back-forward-list-item.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list-item.h
index c1b762e..fd3daca 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-back-forward-list-item.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list-item.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_BACK_FORWARD_LIST_ITEM_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-back-forward-list.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h
similarity index 96%
rename from dali/devel-api/adaptor-framework/web-engine-back-forward-list.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h
index 0dee5c4..cc54bda 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-back-forward-list.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_BACK_FORWARD_LIST_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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list-item.h>
 
 // EXTERNAL INCLUDES
 #include <string>

diff --git a/dali/devel-api/adaptor-framework/web-engine-certificate.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h
similarity index 97%
rename from dali/devel-api/adaptor-framework/web-engine-certificate.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h
index cd0b055..d0a0699 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-certificate.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_CERTIFICATE_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-console-message.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h
similarity index 97%
rename from dali/devel-api/adaptor-framework/web-engine-console-message.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h
index 22e19fe..1456e43 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-console-message.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_CONSOLE_MESSAGE_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-context-menu-item.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h
similarity index 99%
rename from dali/devel-api/adaptor-framework/web-engine-context-menu-item.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h
index bb801ba..72ca7f9 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-context-menu-item.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_CONTEXT_MENU_ITEM_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-context-menu.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h
similarity index 95%
rename from dali/devel-api/adaptor-framework/web-engine-context-menu.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h
index 2593a9d..4ea9834 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-context-menu.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_CONTEXT_MENU_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.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
 #include <dali/public-api/math/vector2.h>
 #include <memory>
 #include <string>

diff --git a/dali/devel-api/adaptor-framework/web-engine-context.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-context.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/web-engine-context.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-context.h
index 3f9a36d..ebfe9aa 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-context.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-context.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_CONTEXT_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.
@@ -25,8 +25,8 @@
 #include <vector>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-request-interceptor.h>
-#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-request-interceptor.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h>
 
 namespace Dali
 {

diff --git a/dali/devel-api/adaptor-framework/web-engine-cookie-manager.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/web-engine-cookie-manager.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h
index 481c120..983c10d 100644 (file)
--- a/dali/devel-api/adaptor-framework/web-engine-cookie-manager.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_COOKIE_MANAGER_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h
similarity index 95%
rename from dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h
index 68df413..52a0355 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_FORM_REPOST_DECISION_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-frame.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h
similarity index 95%
rename from dali/devel-api/adaptor-framework/web-engine-frame.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h
index 51beba9..25ec2d3 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-frame.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_FRAME_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-hit-test.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/web-engine-hit-test.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h
index 62dbcfa..cb72293 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-hit-test.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_HIT_TEST_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h
similarity index 97%
rename from dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h
index 6fcc132..b140c2b 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_HTTP_AUTH_HANDLER_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-load-error.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/web-engine-load-error.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h
index f9d0854..1489e6c 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-load-error.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_LOAD_ERROR_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
similarity index 99%
rename from dali/devel-api/adaptor-framework/web-engine-plugin.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
index 2e30f8c..d4238ce 100644 (file)
--- a/dali/devel-api/adaptor-framework/web-engine-plugin.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_PLUGIN_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.
@@ -27,7 +27,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/web-engine-hit-test.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h>
 #include <dali/devel-api/common/bitwise-enum.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 

diff --git a/dali/devel-api/adaptor-framework/web-engine-policy-decision.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/web-engine-policy-decision.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h
index a9fda10..d1aef33 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-policy-decision.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_POLICY_DECISION_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-request-interceptor.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-request-interceptor.h
similarity index 100%
rename from dali/devel-api/adaptor-framework/web-engine-request-interceptor.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-request-interceptor.h

diff --git a/dali/devel-api/adaptor-framework/web-engine-security-origin.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h
similarity index 96%
rename from dali/devel-api/adaptor-framework/web-engine-security-origin.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h
index 4161878..4d5c4af 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-security-origin.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_SECURITY_ORIGIN_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine-settings.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h
similarity index 99%
rename from dali/devel-api/adaptor-framework/web-engine-settings.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h
index b2ba728..ae7bc99 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-settings.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_SETTINGS_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.

diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
similarity index 93%
rename from dali/devel-api/adaptor-framework/web-engine.cpp
rename to dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
index badddf8..4176021 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.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.
@@ -16,20 +16,20 @@
  */
 
 // CLASSHEADER
-#include <dali/devel-api/adaptor-framework/web-engine.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
-#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
-#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.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-settings.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h>
 #include <dali/internal/web-engine/common/web-engine-impl.h>
 
 // EXTERNAL INCLUDES

diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
similarity index 99%
rename from dali/devel-api/adaptor-framework/web-engine.h
rename to dali/devel-api/adaptor-framework/web-engine/web-engine.h
index 3d45c08..8b73317 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_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.
@@ -23,7 +23,7 @@
 
 //INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/web-engine-plugin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
index 50b8c48..c332a7e 100755 (executable)
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@ -9,6 +9,7 @@ SET( devel_api_src_files
   ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-gradient.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/accessibility.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/actor-accessible.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/animated-image-loading.cpp
@@ -45,7 +46,6 @@ SET( devel_api_src_files
   ${adaptor_devel_api_dir}/adaptor-framework/video-player.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/virtual-keyboard.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/thread-settings.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/window-devel.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/gl-window.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/offscreen-application.cpp
@@ -97,25 +97,6 @@ SET( devel_api_adaptor_framework_header_files
   ${adaptor_devel_api_dir}/adaptor-framework/vector-image-renderer.h
   ${adaptor_devel_api_dir}/adaptor-framework/video-player.h
   ${adaptor_devel_api_dir}/adaptor-framework/video-player-plugin.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-back-forward-list.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-back-forward-list-item.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-certificate.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-console-message.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-context.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-context-menu.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-context-menu-item.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-cookie-manager.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-form-repost-decision.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-frame.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-http-auth-handler.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-load-error.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-hit-test.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-plugin.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-policy-decision.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-request-interceptor.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-security-origin.h
-  ${adaptor_devel_api_dir}/adaptor-framework/web-engine-settings.h
   ${adaptor_devel_api_dir}/adaptor-framework/key-extension-plugin.h
   ${adaptor_devel_api_dir}/adaptor-framework/virtual-keyboard.h
   ${adaptor_devel_api_dir}/adaptor-framework/physical-keyboard.h
@@ -143,6 +124,30 @@ SET( devel_api_adaptor_framework_canvas_renderer_header_files
   ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-picture.h
 )
 
+
+SET( devel_api_adaptor_framework_web_engine_header_files
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-back-forward-list.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-back-forward-list-item.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-certificate.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-console-message.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-context.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-context-menu.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-context-menu-item.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-cookie-manager.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-form-repost-decision.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-frame.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-http-auth-handler.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-load-error.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-hit-test.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-plugin.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-policy-decision.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-request-interceptor.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-security-origin.h
+  ${adaptor_devel_api_dir}/adaptor-framework/web-engine/web-engine-settings.h
+)
+
+
 SET( devel_api_atspi_interfaces_header_files
   ${adaptor_devel_api_dir}/atspi-interfaces/accessible.h
   ${adaptor_devel_api_dir}/atspi-interfaces/action.h

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index 808e9c9..ed91a6b 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.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.
@@ -26,16 +26,16 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/environment-variable.h>
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
-#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
-#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.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-settings.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h>
 #include <dali/internal/system/common/environment-variables.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/images/pixel-data.h>

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index 0423b6b..3034d0f 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_IMPL_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.
@@ -23,8 +23,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/web-engine-plugin.h>
-#include <dali/devel-api/adaptor-framework/web-engine.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine.h>
 
 namespace Dali
 {