Add CefFrame::GetV8Context() method for retrieving the V8 context of a frame (issue #344).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@345 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

tests/cefclient/cefclient.cpp

@@ -14,6 +14,54 @@
 #include <stdio.h>
 #include <string>
 
+namespace {
+
+void UIT_InvokeScript(CefRefPtr<CefBrowser> browser)
+{
+  REQUIRE_UI_THREAD();
+
+  CefRefPtr<CefFrame> frame = browser->GetMainFrame();
+  CefRefPtr<CefV8Context> v8Context = frame->GetV8Context();
+  CefString url = frame->GetURL();
+
+  if (!v8Context.get()) {
+    frame->ExecuteJavaScript("alert('Failed to get V8 context!');", url, 0);
+  } else if (v8Context->Enter()) {
+    CefRefPtr<CefV8Value> globalObj = v8Context->GetGlobal();
+    CefRefPtr<CefV8Value> evalFunc = globalObj->GetValue("eval");
+
+    CefRefPtr<CefV8Value> arg0 = CefV8Value::CreateString("1+2");
+
+    CefV8ValueList args;
+    args.push_back(arg0);
+
+    CefRefPtr<CefV8Value> retVal;
+    CefString exception;
+    if (evalFunc->ExecuteFunctionWithContext(v8Context, globalObj, args, retVal,
+                                             exception)) {
+      if (retVal.get()) {
+        frame->ExecuteJavaScript(
+            std::string("alert('InvokeScript returns ") +
+            retVal->GetStringValue().ToString() + "!');",
+            url, 0);
+      } else {
+        frame->ExecuteJavaScript(
+            std::string("alert('InvokeScript returns exception: ") +
+            exception.ToString() + "!');",
+            url, 0);
+      }
+    } else {
+      frame->ExecuteJavaScript("alert('Failed to execute function!');", url, 0);
+    }
+
+    v8Context->Exit();
+  } else {
+    frame->ExecuteJavaScript("alert('Failed to enter into V8 context!');",
+        url, 0);
+  }
+}
+
+} // namespace
 
 CefRefPtr<ClientHandler> g_handler;
 
@@ -102,6 +150,16 @@ void RunJavaScriptExecuteTest(CefRefPtr<CefBrowser> browser)
       "alert('JavaScript execute works!');", "about:blank", 0);
 }
 
+void RunJavaScriptInvokeTest(CefRefPtr<CefBrowser> browser)
+{
+  if (CefCurrentlyOn(TID_UI)) {
+    UIT_InvokeScript(browser);
+  } else {
+    // Execute on the UI thread.
+    CefPostTask(TID_UI, NewCefRunnableFunction(&UIT_InvokeScript, browser));
+  }
+}
+
 void RunPopupTest(CefRefPtr<CefBrowser> browser)
 {
   browser->GetMainFrame()->ExecuteJavaScript(

tests/cefclient/cefclient.h

@@ -21,6 +21,7 @@ void RunGetSourceTest(CefRefPtr<CefBrowser> browser);
 void RunGetTextTest(CefRefPtr<CefBrowser> browser);
 void RunRequestTest(CefRefPtr<CefBrowser> browser);
 void RunJavaScriptExecuteTest(CefRefPtr<CefBrowser> browser);
+void RunJavaScriptInvokeTest(CefRefPtr<CefBrowser> browser);
 void RunPopupTest(CefRefPtr<CefBrowser> browser);
 void RunLocalStorageTest(CefRefPtr<CefBrowser> browser);
 void RunAccelerated2DCanvasTest(CefRefPtr<CefBrowser> browser);

tests/cefclient/cefclient.rc

@@ -77,6 +77,7 @@ BEGIN
         MENUITEM "JavaScript Extension Handler",ID_TESTS_JAVASCRIPT_EXTENSION
         MENUITEM "JavaScript Extension Performance",ID_TESTS_JAVASCRIPT_PERFORMANCE
         MENUITEM "JavaScript Execute",          ID_TESTS_JAVASCRIPT_EXECUTE
+        MENUITEM "JavaScript Invoke",           ID_TESTS_JAVASCRIPT_INVOKE
         MENUITEM "Plugin",                      ID_TESTS_PLUGIN
         MENUITEM "Popup Window",                ID_TESTS_POPUP
         MENUITEM "Transparent Popup Window",    ID_TESTS_TRANSPARENT_POPUP

tests/cefclient/cefclient_mac.mm

@@ -190,6 +190,7 @@ NSButton* MakeButton(NSRect* rect, NSString* title, NSView* parent) {
 - (IBAction)testJSExtension:(id)sender;
 - (IBAction)testJSExtensionPerf:(id)sender;
 - (IBAction)testJSExecute:(id)sender;
+- (IBAction)testJSInvoke:(id)sender;
 - (IBAction)testRequest:(id)sender;
 - (IBAction)testLocalStorage:(id)sender;
 - (IBAction)testXMLHttpRequest:(id)sender;
@@ -243,6 +244,9 @@ NSButton* MakeButton(NSRect* rect, NSString* title, NSView* parent) {
   [testMenu addItemWithTitle:@"JavaScript Execute"
                       action:@selector(testJSExecute:)
                keyEquivalent:@""];
+  [testMenu addItemWithTitle:@"JavaScript Invoke"
+                      action:@selector(testJSInvoke:)
+               keyEquivalent:@""];
   [testMenu addItemWithTitle:@"Popup Window"
                       action:@selector(testPopupWindow:)
                keyEquivalent:@""];
@@ -411,6 +415,11 @@ NSButton* MakeButton(NSRect* rect, NSString* title, NSView* parent) {
     RunJavaScriptExecuteTest(g_handler->GetBrowser());
 }
 
+- (IBAction)testJSInvoke:(id)sender {
+  if(g_handler.get() && g_handler->GetBrowserHwnd())
+    RunJavaScriptInvokeTest(g_handler->GetBrowser());
+}
+
 - (IBAction)testRequest:(id)sender {
   if(g_handler.get() && g_handler->GetBrowserHwnd())
     RunRequestTest(g_handler->GetBrowser());

tests/cefclient/cefclient_win.cpp

@@ -487,6 +487,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
           if(browser.get())
             RunJavaScriptExecuteTest(browser);
           return 0;
+        case ID_TESTS_JAVASCRIPT_INVOKE:
+          if(browser.get())
+            RunJavaScriptInvokeTest(browser);
+          return 0;
         case ID_TESTS_PLUGIN: // Test the custom plugin
           if(browser.get())
             RunPluginTest(browser);

tests/cefclient/resource.h

@@ -55,6 +55,7 @@
 #define ID_TESTS_JAVASCRIPT_PERFORMANCE 32795
 #define ID_TESTS_TRANSPARENT_POPUP      32796
 #define ID_TESTS_TRANSPARENT_OSRAPP     32797
+#define ID_TESTS_JAVASCRIPT_INVOKE      32798
 #define IDC_STATIC                      -1
 #define IDS_LOGO                        1000
 #define IDS_UIPLUGIN                    1001