From e60ac51c4b7d6884793f210c02814c2b65f406cb Mon Sep 17 00:00:00 2001 From: huayongxu <49056704+huayongxu@users.noreply.github.com> Date: Thu, 13 May 2021 16:59:48 +0800 Subject: [PATCH] Rename functions, variables, etc related to policy decision. (#3021) Co-authored-by: dongsug-song <35130733+dongsug-song@users.noreply.github.com> Co-authored-by: Jiyun Yang --- ...nMaker.cs => Interop.WebPolicyDecisionMaker.cs} | 2 +- .../src/internal/Interop/Interop.WebView.cs | 8 ++--- ...yDecisionMaker.cs => WebPolicyDecisionMaker.cs} | 28 ++++++++-------- src/Tizen.NUI/src/internal/WebView/WebView.cs | 38 ++++++++++++---------- ...cs => WebViewResponsePolicyDecidedEventArgs.cs} | 12 +++---- ...al.cs => WebViewResponsePolicyDecidedSignal.cs} | 6 ++-- 6 files changed, 48 insertions(+), 46 deletions(-) rename src/Tizen.NUI/src/internal/Interop/{Interop.WebNewWindowPolicyDecisionMaker.cs => Interop.WebPolicyDecisionMaker.cs} (98%) rename src/Tizen.NUI/src/internal/WebView/{WebNewWindowPolicyDecisionMaker.cs => WebPolicyDecisionMaker.cs} (82%) rename src/Tizen.NUI/src/internal/WebView/{WebViewNewWindowPolicyDecidedEventArgs.cs => WebViewResponsePolicyDecidedEventArgs.cs} (68%) rename src/Tizen.NUI/src/internal/WebView/{WebViewNewWindowPolicyDecidedSignal.cs => WebViewResponsePolicyDecidedSignal.cs} (88%) diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.WebNewWindowPolicyDecisionMaker.cs b/src/Tizen.NUI/src/internal/Interop/Interop.WebPolicyDecisionMaker.cs similarity index 98% rename from src/Tizen.NUI/src/internal/Interop/Interop.WebNewWindowPolicyDecisionMaker.cs rename to src/Tizen.NUI/src/internal/Interop/Interop.WebPolicyDecisionMaker.cs index bd7bbde..050ef87 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.WebNewWindowPolicyDecisionMaker.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.WebPolicyDecisionMaker.cs @@ -19,7 +19,7 @@ namespace Tizen.NUI { internal static partial class Interop { - internal static partial class WebNewWindowPolicyDecisionMaker + internal static partial class WebPolicyDecisionMaker { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WebPolicyDecision_GetUrl")] public static extern string GetUrl(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.WebView.cs b/src/Tizen.NUI/src/internal/Interop/Interop.WebView.cs index 41a2556..a64e235 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.WebView.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.WebView.cs @@ -312,11 +312,11 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WebViewFrameRenderedSignal_Disconnect")] public static extern void WebViewFrameRenderedSignalDisconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_WebViewPolicyDecisionSignal_PolicyDecision")] - public static extern global::System.IntPtr NewWebViewPolicyDecisionSignalPolicyDecision(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_WebViewResponsePolicyDecisionSignal_ResponsePolicyDecision")] + public static extern global::System.IntPtr NewWebViewResponsePolicyDecisionSignalPolicyDecision(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_WebViewPolicyDecisionSignal")] - public static extern void DeleteWebViewPolicyDecisionSignal(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_WebViewResponsePolicyDecisionSignal")] + public static extern void DeleteWebViewResponsePolicyDecisionSignal(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WebViewPolicyDecisionSignal_Connect")] public static extern void WebViewPolicyDecisionSignalConnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/WebView/WebNewWindowPolicyDecisionMaker.cs b/src/Tizen.NUI/src/internal/WebView/WebPolicyDecisionMaker.cs similarity index 82% rename from src/Tizen.NUI/src/internal/WebView/WebNewWindowPolicyDecisionMaker.cs rename to src/Tizen.NUI/src/internal/WebView/WebPolicyDecisionMaker.cs index 866638e..a4e06a1 100755 --- a/src/Tizen.NUI/src/internal/WebView/WebNewWindowPolicyDecisionMaker.cs +++ b/src/Tizen.NUI/src/internal/WebView/WebPolicyDecisionMaker.cs @@ -21,12 +21,12 @@ using System.ComponentModel; namespace Tizen.NUI { /// - /// It is a class for new window policy decision maker of web view. + /// It is a class for policy decision maker of web view. /// [EditorBrowsable(EditorBrowsableState.Never)] - public class WebNewWindowPolicyDecisionMaker : Disposable + public class WebPolicyDecisionMaker : Disposable { - internal WebNewWindowPolicyDecisionMaker(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn) + internal WebPolicyDecisionMaker(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn) { } @@ -106,7 +106,7 @@ namespace Tizen.NUI { get { - return Interop.WebNewWindowPolicyDecisionMaker.GetUrl(SwigCPtr); + return Interop.WebPolicyDecisionMaker.GetUrl(SwigCPtr); } } @@ -118,7 +118,7 @@ namespace Tizen.NUI { get { - return Interop.WebNewWindowPolicyDecisionMaker.GetCookie(SwigCPtr); + return Interop.WebPolicyDecisionMaker.GetCookie(SwigCPtr); } } @@ -130,7 +130,7 @@ namespace Tizen.NUI { get { - return (DecisionType)Interop.WebNewWindowPolicyDecisionMaker.GetDecisionType(SwigCPtr); + return (DecisionType)Interop.WebPolicyDecisionMaker.GetDecisionType(SwigCPtr); } } @@ -142,7 +142,7 @@ namespace Tizen.NUI { get { - return Interop.WebNewWindowPolicyDecisionMaker.GetResponseMime(SwigCPtr); + return Interop.WebPolicyDecisionMaker.GetResponseMime(SwigCPtr); } } @@ -154,7 +154,7 @@ namespace Tizen.NUI { get { - return Interop.WebNewWindowPolicyDecisionMaker.GetResponseStatusCode(SwigCPtr); + return Interop.WebPolicyDecisionMaker.GetResponseStatusCode(SwigCPtr); } } @@ -166,7 +166,7 @@ namespace Tizen.NUI { get { - return (NavigationType)Interop.WebNewWindowPolicyDecisionMaker.GetNavigationType(SwigCPtr); + return (NavigationType)Interop.WebPolicyDecisionMaker.GetNavigationType(SwigCPtr); } } @@ -178,7 +178,7 @@ namespace Tizen.NUI { get { - IntPtr result = Interop.WebNewWindowPolicyDecisionMaker.GetFrame(SwigCPtr); + IntPtr result = Interop.WebPolicyDecisionMaker.GetFrame(SwigCPtr); return new WebFrame(result, false); } } @@ -191,7 +191,7 @@ namespace Tizen.NUI { get { - return Interop.WebNewWindowPolicyDecisionMaker.GetScheme(SwigCPtr); + return Interop.WebPolicyDecisionMaker.GetScheme(SwigCPtr); } } @@ -201,7 +201,7 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] public bool Use() { - bool result = Interop.WebNewWindowPolicyDecisionMaker.Use(SwigCPtr); + bool result = Interop.WebPolicyDecisionMaker.Use(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return result; } @@ -212,7 +212,7 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] public bool Ignore() { - bool result = Interop.WebNewWindowPolicyDecisionMaker.Ignore(SwigCPtr); + bool result = Interop.WebPolicyDecisionMaker.Ignore(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return result; } @@ -223,7 +223,7 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] public bool Suspend() { - bool result = Interop.WebNewWindowPolicyDecisionMaker.Suspend(SwigCPtr); + bool result = Interop.WebPolicyDecisionMaker.Suspend(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return result; } diff --git a/src/Tizen.NUI/src/internal/WebView/WebView.cs b/src/Tizen.NUI/src/internal/WebView/WebView.cs index 38f549b..3c303f4 100755 --- a/src/Tizen.NUI/src/internal/WebView/WebView.cs +++ b/src/Tizen.NUI/src/internal/WebView/WebView.cs @@ -73,9 +73,9 @@ namespace Tizen.NUI private HitTestFinishedCallback hitTestFinishedCallback; private readonly WebViewHitTestFinishedProxyCallback hitTestFinishedProxyCallback; - private readonly WebViewNewWindowPolicyDecidedSignal newWindowPolicyDecidedSignal; - private EventHandler newWindowPolicyDecidedEventHandler; - private WebViewNewWindowPolicyDecidedCallbackDelegate newWindowPolicyDecidedCallback; + private readonly WebViewResponsePolicyDecidedSignal responsePolicyDecidedSignal; + private EventHandler responsePolicyDecidedEventHandler; + private WebViewResponsePolicyDecidedCallbackDelegate responsePolicyDecidedCallback; private readonly WebViewCertificateReceivedSignal certificateConfirmedSignal; private EventHandler certificateConfirmedEventHandler; @@ -155,7 +155,7 @@ namespace Tizen.NUI urlChangedSignal = new WebViewUrlChangedSignal(Interop.WebView.NewWebViewUrlChangedSignalUrlChanged(SwigCPtr)); formRepostPolicyDecidedSignal = new WebViewFormRepostPolicyDecidedSignal(Interop.WebView.NewWebViewFormRepostDecisionSignalFormRepostDecision(SwigCPtr)); frameRenderedSignal = new WebViewFrameRenderedSignal(Interop.WebView.WebViewFrameRenderedSignalFrameRenderedGet(SwigCPtr)); - newWindowPolicyDecidedSignal = new WebViewNewWindowPolicyDecidedSignal(Interop.WebView.NewWebViewPolicyDecisionSignalPolicyDecision(SwigCPtr)); + responsePolicyDecidedSignal = new WebViewResponsePolicyDecidedSignal(Interop.WebView.NewWebViewResponsePolicyDecisionSignalPolicyDecision(SwigCPtr)); certificateConfirmedSignal = new WebViewCertificateReceivedSignal(Interop.WebView.NewWebViewCertificateSignalCertificateConfirm(SwigCPtr)); sslCertificateChangedSignal = new WebViewCertificateReceivedSignal(Interop.WebView.NewWebViewCertificateSignalSslCertificateChanged(SwigCPtr)); httpAuthRequestedSignal = new WebViewHttpAuthRequestedSignal(Interop.WebView.NewWebViewHttpAuthHandlerSignalHttpAuthHandler(SwigCPtr)); @@ -197,7 +197,7 @@ namespace Tizen.NUI urlChangedSignal.Dispose(); formRepostPolicyDecidedSignal.Dispose(); frameRenderedSignal.Dispose(); - newWindowPolicyDecidedSignal.Dispose(); + responsePolicyDecidedSignal.Dispose(); certificateConfirmedSignal.Dispose(); sslCertificateChangedSignal.Dispose(); httpAuthRequestedSignal.Dispose(); @@ -304,7 +304,7 @@ namespace Tizen.NUI private delegate void WebViewHitTestFinishedProxyCallback(IntPtr data); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void WebViewNewWindowPolicyDecidedCallbackDelegate(IntPtr data, IntPtr maker); + private delegate void WebViewResponsePolicyDecidedCallbackDelegate(IntPtr data, IntPtr maker); [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate void WebViewCertificateReceivedCallbackDelegate(IntPtr data, IntPtr certificate); @@ -533,27 +533,27 @@ namespace Tizen.NUI } /// - /// Event for the NewWindowPolicyDecided signal which can be used to subscribe or unsubscribe the event handler.
- /// This signal is emitted when new window policy would be decided.
+ /// Event for the ResponsePolicyDecided signal which can be used to subscribe or unsubscribe the event handler.
+ /// This signal is emitted when response policy would be decided.
/// [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler NewWindowPolicyDecided + public event EventHandler ResponsePolicyDecided { add { - if (newWindowPolicyDecidedEventHandler == null) + if (responsePolicyDecidedEventHandler == null) { - newWindowPolicyDecidedCallback = OnNewWindowPolicyDecided; - newWindowPolicyDecidedSignal.Connect(newWindowPolicyDecidedCallback); + responsePolicyDecidedCallback = OnResponsePolicyDecided; + responsePolicyDecidedSignal.Connect(responsePolicyDecidedCallback); } - newWindowPolicyDecidedEventHandler += value; + responsePolicyDecidedEventHandler += value; } remove { - newWindowPolicyDecidedEventHandler -= value; - if (newWindowPolicyDecidedEventHandler == null && newWindowPolicyDecidedCallback != null) + responsePolicyDecidedEventHandler -= value; + if (responsePolicyDecidedEventHandler == null && responsePolicyDecidedCallback != null) { - newWindowPolicyDecidedSignal.Disconnect(newWindowPolicyDecidedCallback); + responsePolicyDecidedSignal.Disconnect(responsePolicyDecidedCallback); } } } @@ -1188,6 +1188,8 @@ namespace Tizen.NUI get { global::System.IntPtr imageView = Interop.WebView.GetFavicon(SwigCPtr); + if (imageView == IntPtr.Zero) + return null; return new ImageView(imageView, false); } } @@ -2104,9 +2106,9 @@ namespace Tizen.NUI image.Dispose(); } - private void OnNewWindowPolicyDecided(IntPtr data, IntPtr maker) + private void OnResponsePolicyDecided(IntPtr data, IntPtr maker) { - newWindowPolicyDecidedEventHandler?.Invoke(this, new WebViewNewWindowPolicyDecidedEventArgs(new WebNewWindowPolicyDecisionMaker(maker, false))); + responsePolicyDecidedEventHandler?.Invoke(this, new WebViewResponsePolicyDecidedEventArgs(new WebPolicyDecisionMaker(maker, false))); } private void OnCertificateConfirmed(IntPtr data, IntPtr certificate) diff --git a/src/Tizen.NUI/src/internal/WebView/WebViewNewWindowPolicyDecidedEventArgs.cs b/src/Tizen.NUI/src/internal/WebView/WebViewResponsePolicyDecidedEventArgs.cs similarity index 68% rename from src/Tizen.NUI/src/internal/WebView/WebViewNewWindowPolicyDecidedEventArgs.cs rename to src/Tizen.NUI/src/internal/WebView/WebViewResponsePolicyDecidedEventArgs.cs index 568f5ce..07366cf 100755 --- a/src/Tizen.NUI/src/internal/WebView/WebViewNewWindowPolicyDecidedEventArgs.cs +++ b/src/Tizen.NUI/src/internal/WebView/WebViewResponsePolicyDecidedEventArgs.cs @@ -21,20 +21,20 @@ using System.ComponentModel; namespace Tizen.NUI { /// - /// Event arguments that passed via the WebView.NewWindowPolicyDecided. + /// Event arguments that passed via the WebView.ResponsePolicyDecided. /// [EditorBrowsable(EditorBrowsableState.Never)] - public class WebViewNewWindowPolicyDecidedEventArgs : EventArgs + public class WebViewResponsePolicyDecidedEventArgs : EventArgs { - internal WebViewNewWindowPolicyDecidedEventArgs(WebNewWindowPolicyDecisionMaker maker) + internal WebViewResponsePolicyDecidedEventArgs(WebPolicyDecisionMaker maker) { - NewWindowPolicyDecisionMaker = maker; + ResponsePolicyDecisionMaker = maker; } /// - /// The new window policy decision maker. + /// The response policy decision maker. /// [EditorBrowsable(EditorBrowsableState.Never)] - public WebNewWindowPolicyDecisionMaker NewWindowPolicyDecisionMaker { get; } + public WebPolicyDecisionMaker ResponsePolicyDecisionMaker { get; } } } diff --git a/src/Tizen.NUI/src/internal/WebView/WebViewNewWindowPolicyDecidedSignal.cs b/src/Tizen.NUI/src/internal/WebView/WebViewResponsePolicyDecidedSignal.cs similarity index 88% rename from src/Tizen.NUI/src/internal/WebView/WebViewNewWindowPolicyDecidedSignal.cs rename to src/Tizen.NUI/src/internal/WebView/WebViewResponsePolicyDecidedSignal.cs index 8cd7848..d9a7040 100755 --- a/src/Tizen.NUI/src/internal/WebView/WebViewNewWindowPolicyDecidedSignal.cs +++ b/src/Tizen.NUI/src/internal/WebView/WebViewResponsePolicyDecidedSignal.cs @@ -17,15 +17,15 @@ namespace Tizen.NUI { - internal class WebViewNewWindowPolicyDecidedSignal : Disposable + internal class WebViewResponsePolicyDecidedSignal : Disposable { - public WebViewNewWindowPolicyDecidedSignal(global::System.IntPtr cPtr) : base(cPtr, true) + public WebViewResponsePolicyDecidedSignal(global::System.IntPtr cPtr) : base(cPtr, true) { } protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr) { - Interop.WebView.DeleteWebViewPolicyDecisionSignal(swigCPtr); + Interop.WebView.DeleteWebViewResponsePolicyDecisionSignal(swigCPtr); } public void Connect(System.Delegate func) -- 2.7.4