added jscallback support for new evaluatescript implementation

cefsharp · Jun 27, 2015 · 762d949 · 762d949
1 parent cc8a07c
commit 762d949
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 18 deletions.
diff --git a/CefSharp.Core/Internals/ClientAdapter.cpp b/CefSharp.Core/Internals/ClientAdapter.cpp
@@ -100,6 +100,9 @@ namespace CefSharp
                 if (static_cast<IBrowserAdapter^>(_browserAdapter) != nullptr)
                 {
                     _browserAdapter->OnAfterBrowserCreated(browser->GetIdentifier());
+                    //save callback factory for this browser
+                    //it's only going to be present after browseradapter is initialized
+                    _javascriptCallbackFactories->Add(browser->GetIdentifier(), _browserAdapter->JavascriptCallbackFactory);
                 }
             }
         }

diff --git a/CefSharp.Core/Internals/ClientAdapter.h b/CefSharp.Core/Internals/ClientAdapter.h
@@ -48,7 +48,8 @@ namespace CefSharp
             gcroot<IBrowserAdapter^> _browserAdapter;
             //contains in-progress eval script tasks
             gcroot<PendingTaskRepository<JavascriptResponse^>^> _pendingTaskRepository;
-
+            //contains js callback factories for each browser
+            gcroot<Dictionary<int, IJavascriptCallbackFactory^>^> _javascriptCallbackFactories;
 
             void ThrowUnknownPopupBrowser(String^ context)
             {
@@ -62,16 +63,21 @@ namespace CefSharp
                 _browserControl(browserControl), 
                 _popupBrowsers(gcnew Dictionary<int, IBrowser^>()),
                 _pendingTaskRepository(gcnew PendingTaskRepository<JavascriptResponse^>()),
+                _javascriptCallbackFactories(gcnew Dictionary<int, IJavascriptCallbackFactory^>()),
                 _browserAdapter(browserAdapter)
             {
                 //create eval script message handler
-                _evalScriptDoneDelegate = new EvaluateScriptDoneDelegate(_pendingTaskRepository);
+                _evalScriptDoneDelegate = new EvaluateScriptDoneDelegate(_pendingTaskRepository, _javascriptCallbackFactories);
                 AddProcessMessageDelegate(_evalScriptDoneDelegate);
             }
 
             ~ClientAdapter()
             {
                 CloseAllPopups(true);
+
+                //this will dispose the repository and cancel all pending tasks
+                delete _pendingTaskRepository;
+
                 _browserControl = nullptr;
                 _browserHwnd = nullptr;
                 _cefBrowser = NULL;

diff --git a/CefSharp.Core/Internals/Messaging/EvaluateScriptDoneDelegate.cpp b/CefSharp.Core/Internals/Messaging/EvaluateScriptDoneDelegate.cpp
@@ -16,8 +16,8 @@ namespace CefSharp
 
         namespace Messaging
         {
-            EvaluateScriptDoneDelegate::EvaluateScriptDoneDelegate(PendingTaskRepository<JavascriptResponse^>^ pendingTasks)
-                :_pendingTasks(pendingTasks)
+            EvaluateScriptDoneDelegate::EvaluateScriptDoneDelegate(PendingTaskRepository<JavascriptResponse^>^ pendingTasks, Dictionary<int, IJavascriptCallbackFactory^>^ callbackFactories)
+                :_pendingTasks(pendingTasks), _callbackFactories(callbackFactories)
             {
 
             }
@@ -51,32 +51,34 @@ namespace CefSharp
                     auto success = argList->GetBool(0);
                     auto callbackId = GetInt64(argList, 1);
 
-                    FinishTask(callbackId, success, argList);
+                    IJavascriptCallbackFactory^ callbackFactory;
+                    _callbackFactories->TryGetValue(browser->GetIdentifier(), callbackFactory);
+
+                    FinishTask(callbackId, success, argList, callbackFactory);
 
                     handled = true;
                 }
 
                 return handled;
             }
 
-            void EvaluateScriptDoneDelegate::FinishTask(int64 callbackId, bool success, CefRefPtr<CefListValue> message)
+            void EvaluateScriptDoneDelegate::FinishTask(int64 callbackId, bool success, CefRefPtr<CefListValue> message, IJavascriptCallbackFactory^ callbackFactory)
             {
                 auto pendingTask = _pendingTasks->RemovePendingTask(callbackId);
                 if (pendingTask != nullptr)
                 {
-                    pendingTask->SetResult(CreateResponse(success, message));
+                    pendingTask->SetResult(CreateResponse(success, message, callbackFactory));
                 }
             }
 
-            JavascriptResponse^ EvaluateScriptDoneDelegate::CreateResponse(bool success, CefRefPtr<CefListValue> message)
+            JavascriptResponse^ EvaluateScriptDoneDelegate::CreateResponse(bool success, CefRefPtr<CefListValue> message, IJavascriptCallbackFactory^ callbackFactory)
             {
                 auto result = gcnew JavascriptResponse();
                 result->Success = success;
 
                 if (success)
                 {
-                    //pass null as IJavascriptCallbackFactory for now
-                    result->Result = DeserializeV8Object(message, 2, nullptr);
+                    result->Result = DeserializeV8Object(message, 2, callbackFactory);
                 }
                 else
                 {

diff --git a/CefSharp.Core/Internals/Messaging/EvaluateScriptDoneDelegate.h b/CefSharp.Core/Internals/Messaging/EvaluateScriptDoneDelegate.h
@@ -18,12 +18,13 @@ namespace CefSharp
             private:
                 DISALLOW_IMPLICIT_CONSTRUCTORS(EvaluateScriptDoneDelegate);
 
+                gcroot<Dictionary<int, IJavascriptCallbackFactory^>^> _callbackFactories;
                 gcroot<PendingTaskRepository<JavascriptResponse^>^> _pendingTasks;
 
-                void FinishTask(int64 callbackId, bool success, CefRefPtr<CefListValue> message);
-                JavascriptResponse^ CreateResponse(bool success, CefRefPtr<CefListValue> message);
+                void FinishTask(int64 callbackId, bool success, CefRefPtr<CefListValue> message, IJavascriptCallbackFactory^ callbackFactory);
+                JavascriptResponse^ CreateResponse(bool success, CefRefPtr<CefListValue> message, IJavascriptCallbackFactory^ callbackFactory);
             public:
-                EvaluateScriptDoneDelegate(PendingTaskRepository<JavascriptResponse^>^ pendingTasks);
+                EvaluateScriptDoneDelegate(PendingTaskRepository<JavascriptResponse^>^ pendingTasks, Dictionary<int, IJavascriptCallbackFactory^>^ callbackFactories);
                 Task<JavascriptResponse^>^ EvaluateScriptAsync(CefRefPtr<CefBrowser> cefBrowser, int browserId, int frameId, String^ script, Nullable<TimeSpan> timeout);
                 virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefProcessId source_process, CefRefPtr<CefProcessMessage> message) override;
             };

diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.cpp b/CefSharp.Core/ManagedCefBrowserAdapter.cpp
@@ -39,6 +39,8 @@ void ManagedCefBrowserAdapter::LoadUrl(String^ address)
 
 void ManagedCefBrowserAdapter::OnAfterBrowserCreated(int browserId)
 {
+    _wcfEnabled = Cef::WcfEnabled;
+
     if (_wcfEnabled)
     {
         _browserProcessServiceHost = gcnew BrowserProcessServiceHost(_javaScriptObjectRepository, Process::GetCurrentProcess()->Id, browserId);
@@ -559,3 +561,13 @@ IBrowser^ ManagedCefBrowserAdapter::GetBrowser()
 {
     return _browserWrapper;
 }
+
+IJavascriptCallbackFactory^ ManagedCefBrowserAdapter::JavascriptCallbackFactory::get()
+{
+    IJavascriptCallbackFactory^ result = nullptr;
+    if (_browserProcessServiceHost != nullptr)
+    {
+        result = _browserProcessServiceHost->JavascriptCallbackFactory;
+    }
+    return result;
+}
diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.h b/CefSharp.Core/ManagedCefBrowserAdapter.h
@@ -165,5 +165,10 @@ namespace CefSharp
         /// </summary>
         /// <returns>Gets the current instance or null</returns>
         virtual IBrowser^ GetBrowser();
+
+        virtual property IJavascriptCallbackFactory^ JavascriptCallbackFactory
+        {
+            CefSharp::Internals::IJavascriptCallbackFactory^ get();
+        }
     };
 }
diff --git a/CefSharp/CefSharp.csproj b/CefSharp/CefSharp.csproj
@@ -114,6 +114,7 @@
     <Compile Include="CefCursorType.cs" />
     <Compile Include="Internals\IJavascriptCallbackFactory.cs" />
     <Compile Include="Internals\IntPtrExtensions.cs" />
+    <Compile Include="Internals\JavascriptCallbackFactory.cs" />
     <Compile Include="Internals\JavascriptCallbackProxy.cs" />
     <Compile Include="Internals\JavascriptCallback.cs" />
     <Compile Include="Internals\JavascriptCallbackEndpointBehavior.cs" />

diff --git a/CefSharp/Internals/BrowserProcessServiceHost.cs b/CefSharp/Internals/BrowserProcessServiceHost.cs
@@ -15,13 +15,15 @@ public class BrowserProcessServiceHost : ServiceHost
     {
         private const long OneHundredAndTwentyEightMegaBytesInBytes = 128*1024*1024;
 
+        public IJavascriptCallbackFactory JavascriptCallbackFactory { get; private set; }
         public JavascriptObjectRepository JavascriptObjectRepository { get; private set; }
         private TaskCompletionSource<OperationContext> operationContextTaskCompletionSource = new TaskCompletionSource<OperationContext>();
 
         public BrowserProcessServiceHost(JavascriptObjectRepository javascriptObjectRepository, int parentProcessId, int browserId)
             : base(typeof(BrowserProcessService), new Uri[0])
         {
             JavascriptObjectRepository = javascriptObjectRepository;
+            JavascriptCallbackFactory = new JavascriptCallbackFactory(new WeakReference(this));
 
             var serviceName = RenderprocessClientFactory.GetServiceName(parentProcessId, browserId);
 

diff --git a/CefSharp/Internals/IBrowserAdapter.cs b/CefSharp/Internals/IBrowserAdapter.cs
@@ -13,6 +13,7 @@ namespace CefSharp.Internals
     /// </summary>
     public interface IBrowserAdapter
     {
+        IJavascriptCallbackFactory JavascriptCallbackFactory { get; }
         Task<JavascriptResponse> EvaluateScriptAsync(string script, TimeSpan? timeout);
         Task<JavascriptResponse> EvaluateScriptAsync(int browserId, Int64 frameId, string script, TimeSpan? timeout);
         void OnAfterBrowserCreated(int browserId);

diff --git a/CefSharp/Internals/JavascriptCallbackFactory.cs b/CefSharp/Internals/JavascriptCallbackFactory.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace CefSharp.Internals
+{
+    public class JavascriptCallbackFactory : IJavascriptCallbackFactory
+    {
+        private readonly WeakReference browserProcessServiceHost;
+
+        public JavascriptCallbackFactory(WeakReference browserProcessServiceHost)
+        {
+            this.browserProcessServiceHost = browserProcessServiceHost;
+        }
+
+        public IJavascriptCallback Create(JavascriptCallback callback)
+        {
+            return new JavascriptCallbackProxy(callback.Id, callback.BrowserId, browserProcessServiceHost);
+        }
+    }
+}
diff --git a/CefSharp/Internals/JavascriptCallbackSurrogate.cs b/CefSharp/Internals/JavascriptCallbackSurrogate.cs
@@ -10,13 +10,11 @@
 
 namespace CefSharp.Internals
 {
-    internal sealed class JavascriptCallbackSurrogate : IDataContractSurrogate
+    internal sealed class JavascriptCallbackSurrogate : JavascriptCallbackFactory, IDataContractSurrogate
     {
-        private readonly WeakReference browserProcessWeakReference;
-
         public JavascriptCallbackSurrogate(WeakReference browserProcessWeakReference)
+            :base(browserProcessWeakReference)
         {
-            this.browserProcessWeakReference = browserProcessWeakReference;
         }
 
         public Type GetDataContractType(Type type)
@@ -39,7 +37,7 @@ public object GetDeserializedObject(object obj, Type targetType)
             var dto = obj as JavascriptCallback;
             if (dto != null)
             {
-                result = new JavascriptCallbackProxy(dto.Id, dto.BrowserId, browserProcessWeakReference);
+                result = Create(dto);
             }
             return result;
         }