- GetJavascriptStackTrace() checks whether running on UI thread.

cztomczak · cztomczak · commit 750eececa8d8 · 2012-09-23T16:06:35.000+01:00
- Dummy API updated: cefpython.py
diff --git a/cefexample/_changelog.txt b/cefexample/_changelog.txt
@@ -1,8 +1,8 @@
 Version 0.42 not yet released.
  * Rebind/reload example added to cefadvanced.py.
  * en-US locale was outdated, came from revision `607`, locales/ directory contains all locales now, the default one is "en-US", others are optional and do not need to be distributed.
- * OnConsoleMessage example added to cefadvanced.py
- * You can now get javascript stack trace, see: [cefpython].GetJavascriptStackTrace() and [cefpython].GetJavascriptStackTraceFormatted().
+ * !OnConsoleMessage example added to cefadvanced.py
+ * You can now get javascript stack trace, see: [cefpython].!GetJavascriptStackTrace() and [cefpython].!GetJavascriptStackTraceFormatted().
 
 Version 0.41 released on 2012-09-14.
  * New options in [ApplicationSettings]: auto_detect_proxy_settings_enabled, pack_loading_disabled.
diff --git a/cefexample/cefpython.py b/cefexample/cefpython.py
@@ -17,6 +17,12 @@ def ExceptHook(type, value, traceObject):
 def GetBrowserByWindowID(windowID):
 	return Browser()
 
+def GetJavascriptStackTrace(frameLimit=100):
+	return []
+
+def GetJavascriptStackTraceFormatted(frameLimit=100):
+	return ""
+
 def GetRealPath(file=None, encodeURL=False):
 	return ""
 
diff --git a/cefpython.pyx b/cefpython.pyx
@@ -261,6 +261,8 @@ def IsKeyModifier(key, modifiers):
 
 def GetJavascriptStackTrace(frameLimit=100):
 
+	assert CurrentlyOn(TID_UI), "cefpython.GetJavascriptStackTrace() may only be called on the UI thread"
+
 	cdef CefRefPtr[CefV8StackTrace] cefTrace = cef_v8_stack.GetCurrent(int(frameLimit))
 	cdef int frameCount = (<CefV8StackTrace*>(cefTrace.get())).GetFrameCount()
 	cdef CefRefPtr[CefV8StackFrame] cefFrame
