Merge 4d1bb4a into f07be8c

Author: santoshmgh

CefSharp.Example/ModelBinding/PropertyInterceptorLogger.cs

@@ -0,0 +1,26 @@
+// Copyright © 2017 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+using System.Diagnostics;
+using CefSharp.ModelBinding;
+
+namespace CefSharp.Example.ModelBinding
+{
+    public class PropertyInterceptorLogger : IPropertyInterceptor
+    {
+        object IPropertyInterceptor.GetIntercept(Func<object> property, string propertyName)
+        {
+            object result = property();
+            Debug.WriteLine("GetIntercept " + propertyName);
+            return result;
+        }
+
+        public void SetIntercept(Action<object> property, object parameter, string propertName)
+        {
+            property(parameter);
+            Debug.WriteLine("SetIntercept " + propertName);
+        }
+    }
+}

CefSharp.Wpf.Example/Views/BrowserTabView.xaml.cs

@@ -46,7 +46,8 @@ public BrowserTabView()
             var bindingOptions = new BindingOptions()
             {
                 Binder = BindingOptions.DefaultBinder.Binder,
-                MethodInterceptor = new MethodInterceptorLogger() // intercept .net methods calls from js and log it
+                MethodInterceptor = new MethodInterceptorLogger(), // intercept .net methods calls from js and log it
+                PropertyInterceptor = new PropertyInterceptorLogger()
             };
 
             //To use the ResolveObject below and bind an object with isAsync:false we must set CefSharpSettings.WcfEnabled = true before
@@ -90,7 +91,7 @@ public BrowserTabView()
                 {
                     if (e.ObjectName == "bound")
                     {
-                        repo.Register("bound", new BoundObject(), isAsync: false, options: BindingOptions.DefaultBinder);
+                        repo.Register("bound", new BoundObject(), isAsync: false, options: bindingOptions);
                     }
                     else if (e.ObjectName == "boundAsync")
                     {

CefSharp/BindingOptions.cs

@@ -29,5 +29,12 @@ public static BindingOptions DefaultBinder
         /// for logging calls (from js) to .net methods.
         /// </summary>
         public IMethodInterceptor MethodInterceptor { get; set; }
+
+        /// <summary>
+        /// Interceptor used for intercepting calls to the target object property. For instance, can be used 
+        /// for logging calls to .net property (from js)
+        /// </summary>
+        public IPropertyInterceptor PropertyInterceptor { get; set; }
+
     }
 }

CefSharp/Internals/JavascriptObject.cs

@@ -62,6 +62,8 @@ public class JavascriptObject //: DynamicObject maybe later
 
         public IMethodInterceptor MethodInterceptor { get; set; }
 
+        public IPropertyInterceptor PropertyInterceptor { get; set; }
+
         public JavascriptObject()
         {
             Methods = new List<JavascriptMethod>();

CefSharp/Internals/JavascriptObjectRepository.cs

@@ -250,6 +250,7 @@ public void Register(string name, object value, bool isAsync, BindingOptions opt
             jsObject.IsAsync = isAsync;
             jsObject.Binder = options?.Binder;
             jsObject.MethodInterceptor = options?.MethodInterceptor;
+            jsObject.PropertyInterceptor = options?.PropertyInterceptor;
 
             AnalyseObjectForBinding(jsObject, analyseMethods: true, analyseProperties: !isAsync, readPropertyValue: false);
         }
@@ -585,7 +586,14 @@ protected virtual bool TryGetProperty(long objectId, string name, out object res
 
             try
             {
-                result = property.GetValue(obj.Value);
+                if (obj.PropertyInterceptor == null)
+                {
+                    result = property.GetValue(obj.Value);
+                }
+                else
+                {
+                    result = obj.PropertyInterceptor.GetIntercept(() => property.GetValue(obj.Value), property.ManagedName);
+                }
 
                 return true;
             }
@@ -618,7 +626,14 @@ protected virtual bool TrySetProperty(long objectId, string name, object value,
             }
             try
             {
-                property.SetValue(obj.Value, value);
+                if (obj.PropertyInterceptor == null)
+                {
+                    property.SetValue(obj.Value, value);
+                }
+                else
+                {
+                    obj.PropertyInterceptor.SetIntercept((p) => property.SetValue(obj.Value, p), value, property.ManagedName);
+                }
 
                 return true;
             }

CefSharp/ModelBinding/IPropertyInterceptor.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CefSharp.ModelBinding
+{
+    /// <summary>
+    /// Provides the capability intercept Net property calls made from javascript as part of the
+    /// JavascriptBinding (JSB) implementation.
+    /// </summary>
+    public interface IPropertyInterceptor
+    {
+        /// <summary>
+        /// Intercept the get property
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="parameters"></param>
+        /// <param name="propertName"></param>
+        /// <returns></returns>
+        object GetIntercept(Func<object> property, string propertName);
+
+        /// <summary>
+        /// Intercept the set property
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="parameters"></param>
+        /// <param name="propertName"></param>
+        /// <returns></returns>
+        void SetIntercept(Action<Object> property, object parameter, string propertName);
+    }
+}
+
+