#159: Changed the IJavascriptProxy.EvaluateScript() method signature …

…a bit, to try and get it working with the cross-process scenario which is a reality w/ CEF3.
cefsharp · Sep 2, 2013 · 632f016 · 632f016
1 parent 0645da4
commit 632f016
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/CefSharp/CefBrowserWrapper.h b/CefSharp/CefBrowserWrapper.h
@@ -251,8 +251,18 @@ namespace CefSharp
 
         Object^ EvaluateScript(String^ script, TimeSpan timeout)
         {
-            // TODO: implement the browserprocess and make it implement IScriptProxy, and set up a WCF listener.
-            return _javaScriptProxy->EvaluateScript(script, timeout.TotalMilliseconds);
+            auto browser = _renderClientAdapter->GetCefBrowser();
+            auto frame = _renderClientAdapter->TryGetCefMainFrame();
+
+            if (browser != nullptr &&
+                frame != nullptr)
+            {
+                return _javaScriptProxy->EvaluateScript(browser->GetIdentifier(), frame->GetIdentifier(), script, timeout.TotalMilliseconds);
+            }
+            else
+            {
+                return nullptr;
+            }
 
             //auto browser = _renderClientAdapter->GetCefBrowser();
 

diff --git a/CefSharp/Internals/JavascriptBinding/IJavascriptProxy.h b/CefSharp/Internals/JavascriptBinding/IJavascriptProxy.h
@@ -1,4 +1,4 @@
-// Copyright © 2010-2013 The CefSharp Project. All rights reserved.
+// Copyright © 2013 The CefSharp Project. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -11,12 +11,12 @@ namespace CefSharp
         namespace JavascriptBinding
         {
             // TODO: Should be internal (a.k.a. private in C++), but I couldn't manage to get InternalsVisibleTo functioning
-            // between C++ projects...
+            // properly between C++ projects...
             [ServiceContract]
             public interface class IJavascriptProxy
             {
                 [OperationContract]
-                Object^ EvaluateScript(String^ script, double timeout);
+                Object^ EvaluateScript(int browserId, int frameId, String^ script, double timeout);
             };
         }
     }