Updated cefadvanced.py example so that it catches

cztomczak · cztomczak · commit cc8666b6d1e9 · 2013-01-04T12:10:29.000-08:00
uncaught javascript exceptions only when running
cefadvanced.html page, it should not exit application
when running other web pages.
diff --git a/cefpython/cef1/windows/binaries/cefadvanced.py b/cefpython/cef1/windows/binaries/cefadvanced.py
@@ -285,6 +285,10 @@ def OnResourceResponse(self, browser, url, response, filter):
         #        response.GetHeaderMultimap()))
 
     def OnUncaughtException(self, browser, frame, exception, stackTrace):
+        if not "cefadvanced.html" in frame.GetUrl():
+            # Exit application when javascript encountered
+            # only for the cefadvanced.html example.
+            return
         url = exception["scriptResourceName"]
         stackTrace = cefpython.FormatJavascriptStackTrace(stackTrace)
         if re.match(r"file:/+", url):
diff --git a/cefpython/cef1/windows/binaries/cefpython_py27.py b/cefpython/cef1/windows/binaries/cefpython_py27.py
@@ -14,9 +14,6 @@
 def CreateBrowserSync(windowInfo, browserSettings, navigateUrl):
     return Browser()
 
-def ExceptHook(type, value, traceObject):
-    return None
-
 def FormatJavascriptStackTrace(stackTrace):
     return ""
 
@@ -26,9 +23,6 @@ def GetBrowserByWindowHandle(windowHandle):
 def GetJavascriptStackTrace(frameLimit=100):
     return []
 
-def GetRealPath(file=None, encodeUrl=False):
-    return ""
-
 def Initialize(applicationSettings={}):
     return None
 
@@ -38,7 +32,7 @@ def IsKeyModifier(key, modifiers):
 def MessageLoop():
     return None
 
-def SingleMessageLoop():
+def MessageLoopWork():
     return None
 
 def QuitMessageLoop():
@@ -62,7 +56,7 @@ def Shutdown():
     "locale": "",
     "locales_dir_path": "",
     "log_file": "",
-    "log_severity": LOGSEVERITY_VERBOSE,
+    "log_severity": LOGSEVERITY_INFO,
     "release_dcheck_enabled": False,
     "multi_threaded_message_loop": False,
     "pack_loading_disabled": False,
@@ -183,6 +177,12 @@ def GetFrame(self):
     def GetFrameNames(self):
         return ["", ""]
 
+    def GetIdentifier(self):
+        return 0
+
+    def GetImage(self, paintElementType, width, height):
+        return PaintBuffer()
+
     def GetJavascriptBindings(self):
         return JavascriptBindings()
 
@@ -195,6 +195,9 @@ def GetOpenerWindowHandle(self):
     def GetOuterWindowHandle(self):
         return 0
 
+    def GetSize(self, paintElementType):
+        return (0,0,)
+
     def GetUserData(self, key):
         return None
 
@@ -219,6 +222,9 @@ def HasDocument(self):
     def HidePopup(self):
         return None
 
+    def Invalidate(self, dirtyRect):
+        return None
+
     def IsFullscreen(self):
         return False
 
@@ -237,6 +243,24 @@ def Reload(self):
     def ReloadIgnoreCache(self):
         return None
 
+    def SendKeyEvent(self, keyType, keyInfo, modifiers):
+        return None
+
+    def SendMouseClickEvent(self, x, y, mouseButtonType, mouseUp, clickCount):
+        return None
+
+    def SendMouseMoveEvent(self, x, y, mouseLeave):
+        return None
+
+    def SendMouseWheelEvent(self, x, y, deltaX, deltaY):
+        return None
+
+    def SendFocusEvent(self, setFocus):
+        return None
+
+    def SendCaptureLostEvent(self):
+        return None
+
     def SetClientCallback(self, name, callback):
         return None
 
@@ -249,6 +273,9 @@ def SetFocus(self, enable):
     def SetJavascriptBindings(self, javascriptBindings):
         return None
 
+    def SetSize(self, paintElementType, width, height):
+        return None
+
     def SetZoomLevel(self, zoomLevel):
         return None
 
@@ -371,9 +398,13 @@ def SetHeaderMap(self, headerMap={}):
     def SetHeaderMultimap(self, headerMultimap=[]):
         return None
 
-#
-# JavascriptBindings class.
-#
+class PaintBuffer:
+
+    def GetIntPointer(self):
+        return 0
+
+    def GetString(self, mode="bgra", origin="top-left"):
+        return ""
 
 class JavascriptBindings:
 
@@ -395,10 +426,6 @@ def SetObject(self, name, obj):
     def SetProperty(self, name, value):
         return None
 
-#
-# JavascriptCallback object.
-#
-
 class JavascriptCallback:
 
     def Call(self, param1, param2, param3_etc):
@@ -407,6 +434,28 @@ def Call(self, param1, param2, param3_etc):
     def GetName(self):
         return name
 
+class WindowUtils:
+
+    @staticmethod
+    def OnSetFocus(windowID, msg, wparam, lparam):
+        return 0
+
+    @staticmethod
+    def OnSize(windowID, msg, wparam, lparam):
+        return 0
+
+    @staticmethod
+    def OnEraseBackground(windowID, msg, wparam, lparam):
+        return 0
+
+    @staticmethod
+    def SetTitle(pyBrowser, pyTitle):
+        return None
+
+    @staticmethod
+    def SetIcon(pyBrowser, icon="inherit"):
+        return None
+
 #
 # DisplayHandler.
 #
@@ -726,26 +775,39 @@ def LifespanHandler_OnBeforeClose(browser):
 def LifespanHandler_RunModal(browser):
     return False
 
-# WindowUtils class.
+#
+# RenderHandler
+#
 
-class WindowUtils:
+PET_VIEW = 0
+PET_POPUP = 0
 
-    @staticmethod
-    def OnSetFocus(windowID, msg, wparam, lparam):
-        return 0
+KEYTYPE_KEYUP = 0
+KEYTYPE_KEYDOWN = 0
+KEYTYPE_CHAR = 0
 
-    @staticmethod
-    def OnSize(windowID, msg, wparam, lparam):
-        return 0
+MOUSEBUTTON_LEFT = 0
+MOUSEBUTTON_MIDDLE = 0
+MOUSEBUTTON_RIGHT = 0
 
-    @staticmethod
-    def OnEraseBackground(windowID, msg, wparam, lparam):
-        return 0
+def RenderHandler_GetViewRect(browser, out_rect):
+    return False
 
-    @staticmethod
-    def SetTitle(pyBrowser, pyTitle):
-        return None
+def RenderHandler_GetScreenRect(browser, out_rect):
+    return False
 
-    @staticmethod
-    def SetIcon(pyBrowser, icon="inherit"):
-        return None
+def RenderHandler_GetScreenPoint(browser, viewX, viewY, out_screenCoordinates):
+    return False
+
+def RenderHandler_OnPopupShow(browser, show):
+    return None
+
+def RenderHandler_OnPopupSize(browser, rect):
+    return None
+
+def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects, 
+        paintBuffer):
+    return None
+
+def RenderHandler_OnCursorChange(browser, cursor):
+    return None
diff --git a/cefpython/cef1/windows/binaries/cefpython_py32.py b/cefpython/cef1/windows/binaries/cefpython_py32.py
