Passing arguments to javascript bindings done.

cztomczak · cztomczak · commit 0a117fac1f1f · 2012-07-14T15:09:47.000+01:00
Returning value from python to javascript done.
diff --git a/browser.pyx b/browser.pyx
@@ -7,7 +7,7 @@ include "utils.pyx"
 
 # Global variables.
 
-cdef map[int, CefRefPtr[CefBrowser]] __cefBrowsers # innerWindowID : browser
+cdef map[int, CefRefPtr[CefBrowser]] __cefBrowsers # innerWindowID : browser # a pointer would be: new map[int, CefRefPtr[CefBrowser]]()
 __pyBrowsers = {}
 
 # This dictionary list of popup browsers is never cleaned, it may contain old inner
diff --git a/cefexample/cefadvanced.html b/cefexample/cefadvanced.html
@@ -38,8 +38,8 @@
 
 <h3>Javascript bindings</h3>
 
-<a href="javascript:PyTest1()">window.PyTest1()</a>,
-<a href="javascript:PyTest2()">window.PyTest2()</a>
+<a href="javascript:alert('Return value from PyTest1: '+PyTest1(100))">window.PyTest1(100)</a><br>
+<a href="javascript:alert('Return value from PyTest2: '+PyTest2(100, 'This string was passed from javascript'))">window.PyTest2(100, 'This string was passed from javascript')</a>
 
 <h3>Popups</h3>
 
diff --git a/cefexample/cefadvanced.py b/cefexample/cefadvanced.py
@@ -55,11 +55,13 @@ def CefAdvanced():
 	cefpython.MessageLoop()
 	cefpython.Shutdown()
 
-def PyTest1():
-	print "PyTest1() called"
+def PyTest1(arg1):
+	print "PyTest1(%s) called" % arg1
+	return 123
 
-def PyTest2():
-	print "PyTest2() called"
+def PyTest2(arg1, arg2):
+	print "PyTest2(%s, %s) called" % (arg1, arg2)
+	return "This string was returned from Python function PyTest2()"
 
 def OnLoadStart(browser, frame):
 	print "OnLoadStart(): frame URL: %s" % frame.GetURL()
@@ -82,10 +84,6 @@ def OnKeyEvent(browser, eventType, keyCode, modifiers, isSystemKey, isAfterJavas
 		return True
 	return False
 
-def JavascriptBindings():
-	# http://code.google.com/p/chromiumembedded/wiki/JavaScriptIntegration
-	pass
-
 def JavascriptCallbacks():
 	pass
 
@@ -103,10 +101,6 @@ def MoveWindow():
 	#cefwindow.MoveWindow(windowID, xpos=0, ypos=0)
 	pass
 
-def DeveloperTools():
-	#browser.ShowDevTools()
-	pass
-
 def LoadContentFromZip():
 	# Allow to pack html/css/images to a zip and run content from this file.
 	# Optionally allow to password protect this zip file.
diff --git a/cefexample/debug.log b/cefexample/debug.log
@@ -631,3 +631,19 @@
 [0712/205256:INFO:CONSOLE(0)] "Uncaught ReferenceError: PyTest1 is not defined," source: file:///D:/cefpython/src/cefexample/cefadvanced.html(1)
 [0712/205300:VERBOSE1:cookie_monster.cc(2122)] WARNING: Unsupported cookie scheme: chrome-devtools
 [0712/205300:VERBOSE1:cookie_monster.cc(2122)] WARNING: Unsupported cookie scheme: chrome-devtools
+[0713/052122:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0713/052235:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0713/053104:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0713/053137:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0713/053656:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0713/053718:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0713/053740:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/130502:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/144619:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145131:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145236:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145429:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145532:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145623:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145702:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
+[0714/145823:ERROR:network_change_notifier_win.cc(111)] WSALookupServiceBegin failed with: 10091
diff --git a/cefpython.pyx b/cefpython.pyx
@@ -17,6 +17,8 @@ include "virtualkeys.pyx"
 include "v8contexthandler.pyx"
 include "functionhandler.pyx"
 
+include "v8utils.pyx"
+
 # Global variables.
 __debug = False
 
diff --git a/functionhandler.pyx b/functionhandler.pyx
@@ -4,15 +4,19 @@
 
 include "imports.pyx"
 include "utils.pyx"
+include "v8utils.pyx"
 
 cdef cbool FunctionHandler_Execute(
 		CefRefPtr[CefV8Context] cefContext,
 		CefString& cefFuncName,
-		CefRefPtr[CefV8Value] cefObject,
+		CefRefPtr[CefV8Value] cefObject, # receiver ('this' object) of the function.
 		CefV8ValueList& cefArguments,
 		CefRefPtr[CefV8Value]& cefRetval,
 		CefString& cefException) with gil:
 
+	cdef vector[CefRefPtr[CefV8Value]].iterator iterator
+	cdef CefRefPtr[CefV8Value] cefValue
+
 	try:
 		pyBrowser = GetPyBrowserByCefBrowser((<CefV8Context*>(cefContext.get())).GetBrowser())
 		pyFrame = GetPyFrameByCefFrame((<CefV8Context*>(cefContext.get())).GetFrame())
@@ -37,13 +41,19 @@ cdef cbool FunctionHandler_Execute(
 		if pyBrowser.IsPopup() and not javascriptBindings.GetBindToPopups():
 			return <cbool>False
 
-		print "FunctionHandler.Execute(name=%s)" % funcName
-		print "pyFrame.GetIdentifier(): %s" % pyFrame.GetIdentifier()
+		arguments = []
+
+		# cefArguments.
+		iterator = cefArguments.begin()
+		while iterator != cefArguments.end():
+			cefValue = deref(iterator)
+			arguments.append(V8ValueToPyValue(cefValue))
+			preinc(iterator)
 
-		#jsBindings = pyBrowser.GetJavascriptBindings()
-		#if jsBindings:
+		retval = func(*arguments)
+		cefRetval = PyValueToV8Value(retval)
 
-		return <cbool>False
+		return <cbool>True
 
 	except:
 		(exc_type, exc_value, exc_trace) = sys.exc_info()
diff --git a/imports.pyx b/imports.pyx
@@ -46,4 +46,5 @@ from cef_frame cimport *
 cimport cef_types # cannot cimport *, that would cause name conflicts with constants.
 cimport cef_types_win # same as cef_types.
 from cef_v8 cimport *
+cimport cef_v8_static
 from v8functionhandler cimport *
diff --git a/pyinclude/cef_v8.pxd b/pyinclude/cef_v8.pxd
@@ -8,6 +8,7 @@ from cef_browser cimport CefBrowser
 from cef_frame cimport CefFrame
 from cef_string cimport CefString
 from libcpp cimport bool as cbool
+from libcpp.vector cimport vector
 cimport cef_types
 
 cdef extern from "include/cef_v8.h":
@@ -19,19 +20,38 @@ cdef extern from "include/cef_v8.h":
 
 	ctypedef vector[CefRefPtr[CefV8Value]] CefV8ValueList
 
+	cdef cppclass CefV8Accessor:
+		pass
+
 	cdef cppclass CefV8Handler:
 		pass
 
 	cdef cppclass CefV8Value:
+		int GetArrayLength()
+		cbool GetBoolValue()
+		double GetDoubleValue()
+		CefString GetFunctionName()
+		int GetIntValue()
+		cbool GetKeys(vector[CefString]& keys)
+		CefString GetStringValue()
+		CefRefPtr[CefV8Value] GetValue(CefString& key) # object's property by key
+		CefRefPtr[CefV8Value] GetValue(int index) # arrays index value
+		cbool HasValue(CefString& key)
+		cbool HasValue(int index)
+		cbool IsArray()
+		cbool IsBool()
+		cbool IsDate()
+		cbool IsDouble()
+		cbool IsFunction()
+		cbool IsInt()
+		cbool IsNull()
+		cbool IsObject()
+		cbool IsString()
+		cbool IsUndefined()
 		cbool SetValue(
 			CefString& key,
 			CefRefPtr[CefV8Value] value,
 		        cef_types.cef_v8_propertyattribute_t attribute
 		)
 
 
-cdef extern from "include/cef_v8.h" namespace "CefV8Value":
-
-	cdef CefRefPtr[CefV8Value] CreateFunction(
-			CefString& name,
-	                CefRefPtr[CefV8Handler] handler)
diff --git a/pyinclude/cef_v8_static.pxd b/pyinclude/cef_v8_static.pxd
@@ -0,0 +1,32 @@
+# Copyright (c) 2012 CefPython Authors. All rights reserved.
+# License: New BSD License.
+# Website: http://code.google.com/p/cefpython/
+
+from cef_ptr cimport CefRefPtr
+from cef_v8 cimport CefV8Value
+from cef_string cimport CefString
+from cef_v8 cimport CefV8Handler
+from cef_v8 cimport CefV8Accessor
+from cef_base cimport CefBase
+from libcpp cimport bool as cbool
+
+# Importing static methods.
+# This is in a separate file as we do not want these names to be imported
+# into global namespace, you will be using them like this:
+#
+# cimport cef_v8_static
+# cef_v8_static.CreateArray()
+
+cdef extern from "include/cef_v8.h" namespace "CefV8Value":
+
+		cdef CefRefPtr[CefV8Value] CreateArray()
+		cdef CefRefPtr[CefV8Value] CreateBool(cbool value)
+		cdef CefRefPtr[CefV8Value] CreateDouble(double value)
+		cdef CefRefPtr[CefV8Value] CreateFunction(
+			CefString& name,
+	                CefRefPtr[CefV8Handler] handler)
+		cdef CefRefPtr[CefV8Value] CreateInt(int value)
+		cdef CefRefPtr[CefV8Value] CreateNull()
+		cdef CefRefPtr[CefV8Value] CreateObject(CefRefPtr[CefBase] user_data, CefRefPtr[CefV8Accessor] accessor)
+		cdef CefRefPtr[CefV8Value] CreateString(CefString& value)
+		# cdef CefRefPtr[CefV8Value] CreateUndefined()
diff --git a/utils.pyx b/utils.pyx
@@ -2,6 +2,8 @@
 # License: New BSD License.
 # Website: http://code.google.com/p/cefpython/
 
+# This file has nothing to do with util.h
+
 include "imports.pyx"
 include "browser.pyx"
 include "frame.pyx"
diff --git a/v8contexthandler.pyx b/v8contexthandler.pyx
@@ -61,7 +61,7 @@ cdef void V8ContextHandler_OnContextCreated(
 		for funcName in jsBindings:
 			cefFuncName = CefString()
 			cefFuncName.FromASCII(<char*>funcName)
-			func = CreateFunction(cefFuncName, v8Handler)
+			func = cef_v8_static.CreateFunction(cefFuncName, v8Handler)
 			(<CefV8Value*>(window.get())).SetValue(cefFuncName, func, V8_PROPERTY_ATTRIBUTE_NONE)
 
 		# return void
diff --git a/v8utils.pyx b/v8utils.pyx
@@ -0,0 +1,89 @@
+# Copyright (c) 2012 CefPython Authors. All rights reserved.
+# License: New BSD License.
+# Website: http://code.google.com/p/cefpython/
+
+include "imports.pyx"
+include "utils.pyx"
+
+# CefV8 Objects, Arrays and Functions can be created only inside V8 context,
+# you need to call CefV8Context::Enter() and CefV8Context::Exit():
+# http://code.google.com/p/chromiumembedded/issues/detail?id=203
+
+# Javascript arrays may have missing keys, iterating using GetArrayLength()
+# will not work, example: a = [1,2]; a[10] = 3;
+
+# Test passing "window" object from javascript, whether nesting level protection works.
+
+cdef object V8ValueToPyValue(CefRefPtr[CefV8Value] v8Value, nestingLevel=0):
+
+	if nestingLevel > 10:
+		raise Exception("V8ValueToPyValue() failed: data passed from Javascript to Python has"
+				"more than 10 levels of nesting, this is probably an infinite recursion, stopping.")
+
+	cdef CefV8Value* v8ValuePtr = <CefV8Value*>(v8Value.get())
+
+	if v8ValuePtr.IsArray():
+		# nestingLevel+1
+		# TODO
+		pass
+	elif v8ValuePtr.IsBool():
+		return v8ValuePtr.GetBoolValue()
+	elif v8ValuePtr.IsDate():
+		raise Exception("V8ValueToPyValue() failed: Date object is not supported, you are not allowed"
+				"to pass it from Javascript to Python.")
+	elif v8ValuePtr.IsDouble():
+		return v8ValuePtr.GetDoubleValue()
+	elif v8ValuePtr.IsFunction():
+		# TODO: JavascriptCallback
+		# v8Value.GetFunctionName()
+		pass
+	elif v8ValuePtr.IsInt():
+		return v8ValuePtr.GetIntValue()
+	elif v8ValuePtr.IsNull():
+		return None
+	elif v8ValuePtr.IsObject():
+		# nestingLevel+1
+		# TODO
+		pass
+	elif v8ValuePtr.IsString():
+		return CefStringToPyString(v8ValuePtr.GetStringValue())
+	elif v8ValuePtr.IsUndefined():
+		return None
+	else:
+		raise Exception("V8ValueToPyValue() failed: unknown type of CefV8Value.")
+
+
+cdef CefRefPtr[CefV8Value] PyValueToV8Value(object pyValue, nestingLevel=0):
+
+	if nestingLevel > 10:
+		raise Exception("PyValueToV8Value() failed: data passed from Python to Javascript has"
+				"more than 10 levels of nesting, this is probably an infinite recursion, stopping.")
+
+	#cdef CefRefPtr[CefV8Value] v8Value
+	cdef CefString cefString
+
+	pyValueType = type(pyValue)
+
+	if pyValueType == types.ListType:
+		# TODO
+		pass
+	elif pyValueType == types.BooleanType:
+		return cef_v8_static.CreateBool(bool(pyValue))
+	elif pyValueType == types.FloatType:
+		return cef_v8_static.CreateDouble(float(pyValue))
+	elif pyValueType == types.FunctionType or pyValueType == types.MethodType:
+		# TODO: passing callbacks from Python to Javascript.
+		pass
+	elif pyValueType == types.IntType:
+		return cef_v8_static.CreateInt(int(pyValue))
+	elif pyValueType == types.NoneType:
+		return cef_v8_static.CreateNull()
+	elif pyValueType == types.DictType:
+		# TODO
+		pass
+	elif pyValueType == types.StringType:
+		cefString.FromASCII(<char*>pyValue)
+		return cef_v8_static.CreateString(cefString)
+	else:
+		raise Exception("PyValueToV8Value() failed: an unsupported python type was passed from"
+				" python to javascript: %s" % pyValueType.__name__)
