Fixed JavascriptBindings.Rebind(). Also from now on there is

Czarek · Czarek · commit 999f007373f6 · 2013-07-18T18:43:02.000+02:00
a check whether the v8 context has been created when setting
javascript bindings through Browser.SetJavascriptBindings(),
if the context was already created (a possible race condition
during browser creation) then the Rebind() method will be
called automatically.
diff --git a/cefpython/browser.pyx b/cefpython/browser.pyx
@@ -214,6 +214,10 @@ cdef class PyBrowser:
 
         cpdef py_void SetJavascriptBindings(self, JavascriptBindings bindings):
             self.javascriptBindings = bindings
+            if self.GetUserData("__v8ContextCreated"):
+                Debug("Browser.SetJavascriptBindings(): v8 context already"
+                        "created, calling Rebind()")
+                self.javascriptBindings.Rebind()
 
         cpdef JavascriptBindings GetJavascriptBindings(self):
             return self.javascriptBindings
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -46,6 +46,10 @@
 # - Supporting operators that are not yet supported:
 #   | CefRefPtr[T]& Assign "operator="(T* p)
 #   | cefBrowser.Assign(CefBrowser*)
+#   In the same way you can import function with a different name, this one
+#   imports a static method Create() while adding a prefix "CefProcessMessage_":
+#   | cdef extern from ".." namespace "CefProcessMessage":
+#   |   static CefRefPtr[CefProcessMessage] CefProcessMessage_Create(..) "Create()"(..)
 #
 # - Declaring C++ classes in Cython. Storing python callbacks
 #   in a C++ class using Py_INCREF, Py_DECREF. Calling from
@@ -132,9 +136,9 @@ IF CEF_VERSION == 1:
     include "download_handler.pyx"
 
 IF CEF_VERSION == 1:
-    include "v8context_handler.pyx"
-    include "v8function_handler.pyx"
-    include "v8utils.pyx"
+    include "v8context_handler_cef1.pyx"
+    include "v8function_handler_cef1.pyx"
+    include "v8utils_cef1.pyx"
     include "javascript_bindings.pyx"
     include "javascript_callback.pyx"
     include "python_callback.pyx"
diff --git a/cefpython/javascript_bindings.pyx b/cefpython/javascript_bindings.pyx
@@ -97,7 +97,7 @@ cdef class JavascriptBindings:
         cdef PyBrowser pyBrowser
         cdef PyFrame pyFrame
 
-        for frameId in self.__frames:
+        for frameId in self.frames:
             pyBrowser = self.frames[frameId][0]
             pyFrame = self.frames[frameId][1]
             cefBrowser = pyBrowser.GetCefBrowser()
diff --git a/cefpython/v8context_handler_cef1.pyx b/cefpython/v8context_handler_cef1.pyx
@@ -42,6 +42,7 @@ cdef public void V8ContextHandler_OnContextCreated(
 
     try:
         pyBrowser = GetPyBrowser(cefBrowser)
+        pyBrowser.SetUserData("__v8ContextCreated", True)
         pyFrame = GetPyFrame(cefFrame)
 
         javascriptBindings = pyBrowser.GetJavascriptBindings()
diff --git a/cefpython/v8function_handler_cef1.pyx b/cefpython/v8function_handler_cef1.pyx
diff --git a/cefpython/v8utils_cef1.pyx b/cefpython/v8utils_cef1.pyx
@@ -2,57 +2,52 @@
 # License: New BSD License.
 # Website: http://code.google.com/p/cefpython/
 
-# CefV8 Objects, Arrays and Functions can be created only inside V8 context,
-# you need to call CefV8Context::Enter() and CefV8Context::Exit():
+# CefV8 Objects, Arrays and Functions can be created or modified only 
+# inside V8 context, you need to call CefV8Context::Enter() and 
+# CefV8Context::Exit(), see:
 # http://code.google.com/p/chromiumembedded/issues/detail?id=203
-# Entering context should be done for Frame::CallFunction().
-
-# Arrays, objects and functions may only be created, modified and,
-# in the case of functions, executed, if V8 is inside a context.
-
-IF CEF_VERSION == 1:
-
-    cdef list CefV8StackTraceToPython(CefRefPtr[CefV8StackTrace] cefTrace):
-        cdef int frameNumber
-        cdef int frameCount = cefTrace.get().GetFrameCount()
-        cdef CefRefPtr[CefV8StackFrame] cefFrame
-        cdef CefV8StackFrame* framePtr
-        cdef list pyTrace = []
-
-        for frameNumber in range(0, frameCount):
-            cefFrame = cefTrace.get().GetFrame(frameNumber)
-            framePtr = cefFrame.get()
-            pyFrame = {}
-            pyFrame["script"] = CefToPyString(framePtr.GetScriptName())
-            pyFrame["scriptOrSourceUrl"] = CefToPyString(
-                    framePtr.GetScriptNameOrSourceURL())
-            pyFrame["function"] = CefToPyString(framePtr.GetFunctionName())
-            pyFrame["line"] = framePtr.GetLineNumber()
-            pyFrame["column"] = framePtr.GetColumn()
-            pyFrame["isEval"] = framePtr.IsEval()
-            pyFrame["isConstructor"] = framePtr.IsConstructor()
-            pyTrace.append(pyFrame)
-
-        return pyTrace
-
-    cpdef list GetJavascriptStackTrace(int frameLimit=100):
-        assert IsThread(TID_UI), (
-                "cefpython.GetJavascriptStackTrace() may only be called on the UI thread")
-        cdef CefRefPtr[CefV8StackTrace] cefTrace = (
-                cef_v8_stack_trace.GetCurrent(frameLimit))
-        return CefV8StackTraceToPython(cefTrace)
-
-    cpdef str FormatJavascriptStackTrace(list stackTrace):
-        cdef str formatted = ""
-        cdef dict frame
-        for frameNumber, frame in enumerate(stackTrace):
-            formatted += "\t[%s] %s() in %s on line %s (col:%s)\n" % (
-                    frameNumber,
-                    frame["function"],
-                    frame["scriptOrSourceUrl"],
-                    frame["line"],
-                    frame["column"])
-        return formatted
+
+cdef list CefV8StackTraceToPython(CefRefPtr[CefV8StackTrace] cefTrace):
+    cdef int frameNumber
+    cdef int frameCount = cefTrace.get().GetFrameCount()
+    cdef CefRefPtr[CefV8StackFrame] cefFrame
+    cdef CefV8StackFrame* framePtr
+    cdef list pyTrace = []
+
+    for frameNumber in range(0, frameCount):
+        cefFrame = cefTrace.get().GetFrame(frameNumber)
+        framePtr = cefFrame.get()
+        pyFrame = {}
+        pyFrame["script"] = CefToPyString(framePtr.GetScriptName())
+        pyFrame["scriptOrSourceUrl"] = CefToPyString(
+                framePtr.GetScriptNameOrSourceURL())
+        pyFrame["function"] = CefToPyString(framePtr.GetFunctionName())
+        pyFrame["line"] = framePtr.GetLineNumber()
+        pyFrame["column"] = framePtr.GetColumn()
+        pyFrame["isEval"] = framePtr.IsEval()
+        pyFrame["isConstructor"] = framePtr.IsConstructor()
+        pyTrace.append(pyFrame)
+
+    return pyTrace
+
+cpdef list GetJavascriptStackTrace(int frameLimit=100):
+    assert IsThread(TID_UI), (
+            "cefpython.GetJavascriptStackTrace() may only be called on the UI thread")
+    cdef CefRefPtr[CefV8StackTrace] cefTrace = (
+            cef_v8_stack_trace.GetCurrent(frameLimit))
+    return CefV8StackTraceToPython(cefTrace)
+
+cpdef str FormatJavascriptStackTrace(list stackTrace):
+    cdef str formatted = ""
+    cdef dict frame
+    for frameNumber, frame in enumerate(stackTrace):
+        formatted += "\t[%s] %s() in %s on line %s (col:%s)\n" % (
+                frameNumber,
+                frame["function"],
+                frame["scriptOrSourceUrl"],
+                frame["line"],
+                frame["column"])
+    return formatted
 
 cdef object V8ToPyValue(
         CefRefPtr[CefV8Value] v8Value,
