Revert "[Tizen] Rename functions, variables, etc related to policy decision."

This reverts commit b535b74daecdcb3bdd87e7cb17eed142e0d05353.

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
index a3b3a74..e568a3d 100755 (executable)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -256,8 +256,8 @@ public:
     evas_object_smart_callback_add(mWebView, "form,repost,warning,show",
                                    &WebViewContainerForDali::OnFormRepostDecisionRequest,
                                    &mClient);
-    evas_object_smart_callback_add(mWebView, "policy,response,decide",
-                                   &WebViewContainerForDali::OnResponsePolicyDecided,
+    evas_object_smart_callback_add(mWebView, "policy,newwindow,decide",
+                                   &WebViewContainerForDali::OnNewWindowPolicyDecided,
                                    &mClient);
     evas_object_smart_callback_add(mWebView, "request,certificate,confirm",
                                    &WebViewContainerForDali::OnCertificateConfirmRequest,
@@ -936,12 +936,12 @@ private:
     return client->GeolocationPermission(host, protocol);
   }
 
-  static void OnResponsePolicyDecided(void* data, Evas_Object*, void* policy)
+  static void OnNewWindowPolicyDecided(void* data, Evas_Object*, void* policy)
   {
     auto client = static_cast<WebViewContainerClient*>(data);
     Ewk_Policy_Decision* policyDecision = static_cast<Ewk_Policy_Decision*>(policy);
     std::shared_ptr<Dali::WebEnginePolicyDecision> webPolicyDecision(new TizenWebEnginePolicyDecision(policyDecision));
-    client->ResponsePolicyDecided(std::move(webPolicyDecision));
+    client->NewWindowPolicyDecided(std::move(webPolicyDecision));
   }
 
   static void OnCertificateConfirmRequest(void* data, Evas_Object*, void* eventInfo)
@@ -1526,11 +1526,12 @@ Dali::WebEngineBackForwardList& TizenWebEngineChromium::GetBackForwardList() con
 
 std::unique_ptr<Dali::WebEngineHitTest> TizenWebEngineChromium::CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode)
 {
-  if (mWebViewContainer)
+  std::unique_ptr<Dali::WebEngineHitTest> webHitTest;
+  if (!mWebViewContainer)
   {
-    return mWebViewContainer->CreateHitTest(x, y, mode);
+    return webHitTest;
   }
-  return nullptr;
+  return mWebViewContainer->CreateHitTest(x, y, mode);
 }
 
 bool TizenWebEngineChromium::CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback)
@@ -1851,9 +1852,9 @@ Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& TizenWebEngineChromium
   return mConsoleMessageSignal;
 }
 
-Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& TizenWebEngineChromium::ResponsePolicyDecisionSignal()
+Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& TizenWebEngineChromium::PolicyDecisionSignal()
 {
-  return mResponsePolicyDecisionSignal;
+  return mPolicyDecisionSignal;
 }
 
 Dali::WebEnginePlugin::WebEngineCertificateSignalType& TizenWebEngineChromium::CertificateConfirmSignal()
@@ -1962,12 +1963,12 @@ void TizenWebEngineChromium::OnConsoleMessage(std::shared_ptr<Dali::WebEngineCon
   }
 }
 
-void TizenWebEngineChromium::ResponsePolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision)
+void TizenWebEngineChromium::NewWindowPolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision)
 {
-  DALI_LOG_RELEASE_INFO("#ResponsePolicyDecided.\n");
-  if (!mResponsePolicyDecisionSignal.Empty())
+  DALI_LOG_RELEASE_INFO("#NewWindowPolicyDecided.\n");
+  if (!mPolicyDecisionSignal.Empty())
   {
-    mResponsePolicyDecisionSignal.Emit(std::move(decision));
+    mPolicyDecisionSignal.Emit(std::move(decision));
   }
 }
 

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
index f289e90..1b99a8a 100755 (executable)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
@@ -115,7 +115,7 @@ public:
    * policy would be decided.
    * @param [in] decision Policy need be decided.
    */
-  virtual void ResponsePolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision) = 0;
+  virtual void NewWindowPolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision) = 0;
 
   /**
    * @brief Callback function to be called by WebViewContainer when certificate
@@ -698,9 +698,9 @@ public:
   Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& ConsoleMessageSignal() override;
 
   /**
-   * @copydoc Dali::WebEnginePlugin::ResponsePolicyDecisionSignal()
+   * @copydoc Dali::WebEnginePlugin::PolicyDecisionSignal()
    */
-  Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal() override;
+  Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal() override;
 
   /**
    * @copydoc Dali::WebEnginePlugin::CertificateConfirmSignal()
@@ -765,9 +765,9 @@ public:
   void RequestFormRepostDecision(std::shared_ptr<Dali::WebEngineFormRepostDecision> decision) override;
 
   /**
-   * @copydoc Dali::Plugin::WebViewContainerClient::ResponsePolicyDecided()
+   * @copydoc Dali::Plugin::WebViewContainerClient::NewWindowPolicyDecided()
    */
-  void ResponsePolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> policy) override;
+  void NewWindowPolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> policy) override;
 
   /**
    * @copydoc Dali::Plugin::WebViewContainerClient::UrlChanged()
@@ -872,7 +872,7 @@ private:
   Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType           mFrameRenderedSignal;
   Dali::WebEnginePlugin::WebEngineRequestInterceptorSignalType      mRequestInterceptorSignal;
   Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType          mConsoleMessageSignal;
-  Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType  mResponsePolicyDecisionSignal;
+  Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType          mPolicyDecisionSignal;
   Dali::WebEnginePlugin::WebEngineCertificateSignalType             mCertificateConfirmSignal;
   Dali::WebEnginePlugin::WebEngineCertificateSignalType             mSslCertificateChangedSignal;
   Dali::WebEnginePlugin::WebEngineHttpAuthHandlerSignalType         mHttpAuthHandlerSignal;

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-context.h b/dali-extension/web-engine-chromium/tizen-web-engine-context.h
index acf9f3f..70daba2 100755 (executable)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-context.h
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-context.h
@@ -102,7 +102,7 @@ public:
   void DeleteAllWebStorage() override;
 
   /**
-   * @copydoc Dali::WebEngineContext::DeleteWebStorage()
+   * @copydoc Dali::WebEngineContext::DeleteWebStorageOrigin()
    */
   bool DeleteWebStorage(WebEngineSecurityOrigin& origin) override;
 
@@ -152,12 +152,12 @@ public:
   std::string GetContextCertificateFile() const override;
 
   /**
-   * @copydoc Dali::WebEngineContext::SetContextAppId()
+   * @copydoc Dali::WebEngineContext::SetContextTizenAppId()
    */
   void SetContextAppId(const std::string& appID) override;
 
   /**
-   * @copydoc Dali::WebEngineContext::SetContextAppVersion()
+   * @copydoc Dali::WebEngineContext::SetContextTizenAppVersion()
    */
   bool SetContextAppVersion(const std::string& appVersion) override;
 
@@ -207,7 +207,7 @@ public:
   bool DeleteAllWebIndexedDatabase() override;
 
   /**
-   * @copydoc Dali::WebEngineContext::DeleteFormPasswordDataList()
+   * @copydoc Dali::WebEngineContext::FreeFormPasswordDataList()
    */
   void DeleteFormPasswordDataList(const std::vector<std::string>& list) override;
 
@@ -239,7 +239,7 @@ public:
   std::string GetProxyBypassRule() const override;
 
   /**
-   * @copydoc Dali::WebEngineContext::FreeUnusedMemory()
+   * @copydoc Dali::WebEngineContext::NotifyLowMemory()
    */
   bool FreeUnusedMemory() override;
 

diff --git a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h
index 88d4e04..dad7bfa 100755 (executable)
--- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h
+++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h
@@ -547,11 +547,11 @@ public:
   }
 
   /**
-   * @copydoc Dali::WebEnginePlugin::ResponsePolicyDecisionSignal()
+   * @copydoc Dali::WebEnginePlugin::PolicyDecisionSignal()
    */
-  Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal() override
+  Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal() override
   {
-    return mResponsePolicyDecisionSignal;
+    return mPolicyDecisionSignal;
   }
 
   /**
@@ -648,7 +648,7 @@ private:
   Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType           mFrameRenderedSignal;
   Dali::WebEnginePlugin::WebEngineRequestInterceptorSignalType      mRequestInterceptorSignal;
   Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType          mConsoleMessageSignal;
-  Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType  mResponsePolicyDecisionSignal;
+  Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType          mPolicyDecisionSignal;
   Dali::WebEnginePlugin::WebEngineCertificateSignalType             mCertificateConfirmSignal;
   Dali::WebEnginePlugin::WebEngineCertificateSignalType             mSslCertificateChangedSignal;
   Dali::WebEnginePlugin::WebEngineHttpAuthHandlerSignalType         mHttpAuthHandlerSignal;