removed unneeded eval script related methods

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

Hide file tree

Showing 6 changed files with 0 additions and 136 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.cpp
@@ -31,52 +31,6 @@ namespace CefSharp
         }
     }
 
-    JavascriptResponse^ CefBrowserWrapper::EvaluateScriptInContext(CefRefPtr<CefV8Context> context, CefString script)
-    {
-        CefRefPtr<CefV8Value> result;
-        CefRefPtr<CefV8Exception> exception;
-        JavascriptResponse^ response = gcnew JavascriptResponse();
-
-        response->Success = context->Eval(script, result, exception);
-        if (response->Success)
-        {
-            if (result->IsFunction())
-            {
-                response->Result = _callbackRegistry->Register(context, result);
-            }
-            else 
-            {
-                response->Result = TypeUtils::ConvertFromCef(result);
-            }
-        }
-        else if (exception.get())
-        {
-            response->Message = StringUtils::ToClr(exception->GetMessage());
-        }
-
-        return response;
-    }
-
-    JavascriptResponse^ CefBrowserWrapper::DoEvaluateScript(System::Int64 frameId, String^ script)
-    {
-        auto frame = _cefBrowser->GetFrame(frameId);
-        CefRefPtr<CefV8Context> context = frame->GetV8Context();
-
-        if (context.get() && context->Enter())
-        {
-            try
-            {
-                return EvaluateScriptInContext(context, StringUtils::ToNative(script));
-            }
-            finally
-            {
-                context->Exit();
-            }
-        }
-
-        return nullptr;
-    }
-
     JavascriptResponse^ CefBrowserWrapper::DoCallback(System::Int64 callbackId, array<Object^>^ parameters)
     {
         return _callbackRegistry->Execute(callbackId, parameters);

diff --git a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
@@ -62,10 +62,6 @@ namespace CefSharp
         // The WCF proxy to the parent process.
         property IBrowserProcess^ BrowserProcess;
 
-        JavascriptResponse^ EvaluateScriptInContext(CefRefPtr<CefV8Context> context, CefString script);
-
-        virtual JavascriptResponse^ DoEvaluateScript(System::Int64 frameId, String^ script);
-
         JavascriptResponse^ DoCallback(System::Int64 callbackId, array<Object^>^ parameters);
 
         void DestroyJavascriptCallback(Int64 id);

diff --git a/CefSharp.BrowserSubprocess/CefRenderProcess.cs b/CefSharp.BrowserSubprocess/CefRenderProcess.cs
@@ -113,72 +113,6 @@ public override void OnBrowserDestroyed(CefBrowserWrapper browser)
             browser.JavascriptRootObject = null;
         }
 
-        public Task<JavascriptResponse> EvaluateScriptAsync(int browserId, long frameId, string script, TimeSpan? timeout)
-        {
-            var factory = RenderThreadTaskFactory;
-            var browser = browsers.FirstOrDefault(x => x.BrowserId == browserId);
-            if (browser == null)
-            {
-                return TaskExtensions.FromResult(new JavascriptResponse
-                {
-                    Success = false,
-                    Message = string.Format("Browser with Id {0} not found in Render Sub Process.", browserId)
-                });
-            }
-
-            var task = factory.StartNew(() =>
-            {
-                try
-                {
-                    var response = browser.DoEvaluateScript(frameId, script);
-
-                    return response;
-                }
-                catch (Exception ex)
-                {
-                    return new JavascriptResponse
-                    {
-                        Success = false,
-                        Message = ex.ToString()
-                    };
-                }
-            }, TaskCreationOptions.AttachedToParent);
-
-            return timeout.HasValue ? task.WithTimeout(timeout.Value) : task;
-        }
-
-        public IAsyncResult BeginEvaluateScriptAsync(int browserId, long frameId, string script, TimeSpan? timeout, AsyncCallback callback, object state)
-        {
-            var tcs = new TaskCompletionSource<JavascriptResponse>(state);
-            var task = EvaluateScriptAsync(browserId, frameId, script, timeout);
-            task.ContinueWith(t =>
-            {
-                if (t.IsFaulted)
-                {
-                    tcs.TrySetException(t.Exception.InnerExceptions);
-                }
-                else if (t.IsCanceled)
-                {
-                    tcs.TrySetCanceled();
-                }
-                else
-                {
-                    tcs.TrySetResult(t.Result);
-                }
-
-                if (callback != null)
-                {
-                    callback(tcs.Task);
-                }
-            });
-            return tcs.Task;
-        }
-
-        public JavascriptResponse EndEvaluateScriptAsync(IAsyncResult result)
-        {
-            return ((Task<JavascriptResponse>)result).Result;
-        }
-
         public IAsyncResult BeginJavascriptCallbackAsync(int browserId, long callbackId, object[] parameters, TimeSpan? timeout, AsyncCallback callback, object state)
         {
             var tcs = new TaskCompletionSource<JavascriptResponse>(state);

diff --git a/CefSharp/Internals/BrowserProcessServiceHost.cs b/CefSharp/Internals/BrowserProcessServiceHost.cs
@@ -51,20 +51,6 @@ public void SetOperationContext(OperationContext operationContext)
             operationContextTaskCompletionSource.SetResult(operationContext);
         }
 
-        public Task<JavascriptResponse> EvaluateScriptAsync(int browserId, long frameId, string script, TimeSpan? timeout)
-        {
-            var operationContextTask = operationContextTaskCompletionSource.Task;
-            // Use TaskScheduler.Default to ensure that the work occurs
-            // on a background thread.
-            return operationContextTask.ContinueWith(t =>
-            {
-                var context = t.Result;
-                var renderProcess = context.GetCallbackChannel<IRenderProcess>();
-                var asyncResult = renderProcess.BeginEvaluateScriptAsync(browserId, frameId, script, timeout, null, null);
-                return Task.Factory.FromAsync<JavascriptResponse>(asyncResult, renderProcess.EndEvaluateScriptAsync);
-            }, TaskScheduler.Default).Unwrap();
-        }
-
         protected override void OnClose(TimeSpan timeout)
         {
             var task = operationContextTaskCompletionSource.Task;

diff --git a/CefSharp/Internals/IRenderProcess.cs b/CefSharp/Internals/IRenderProcess.cs
@@ -11,11 +11,6 @@ namespace CefSharp.Internals
     [ServiceContract]
     public interface IRenderProcess
     {
-        [OperationContract(AsyncPattern=true)]
-        IAsyncResult BeginEvaluateScriptAsync(int browserId, long frameId, string script, TimeSpan? timeout, AsyncCallback callback, object state);
-
-        JavascriptResponse EndEvaluateScriptAsync(IAsyncResult result);
-
         [OperationContract(AsyncPattern = true)]
         IAsyncResult BeginJavascriptCallbackAsync(int browserId, long callbackId, object[] parameters, TimeSpan? timeout, AsyncCallback callback, object state);
 

diff --git a/CefSharp/Internals/JavascriptCallbackEndpointBehavior.cs b/CefSharp/Internals/JavascriptCallbackEndpointBehavior.cs
@@ -16,7 +16,6 @@ internal sealed class JavascriptCallbackEndpointBehavior : IEndpointBehavior
         private static readonly List<string> Methods = new List<string>
         {
             ReflectionUtils.GetMethodName<IBrowserProcess>(p => p.CallMethod(0, null, null)),
-            ReflectionUtils.GetMethodName<IRenderProcess>(p => p.BeginEvaluateScriptAsync(0, 0, null, null, null, null)).Substring(5),
             ReflectionUtils.GetMethodName<IRenderProcess>(p => p.BeginJavascriptCallbackAsync(0, 0, null, null, null, null)).Substring(5),
         };