Fixed compile errors in CEF Python 1.

Czarek · Czarek · commit d380fe8625a6 · 2013-08-03T11:08:42.000+02:00
Updated docs in the wxpython script (CEF3).
diff --git a/cefpython/.gitignore b/cefpython/.gitignore
@@ -41,3 +41,5 @@ cython_includes/compile_time_constants.pxi
 
 debug_32bit/
 debug_64bit/
+libcef_debug/
+libcef_release/
diff --git a/cefpython/browser.pyx b/cefpython/browser.pyx
@@ -18,10 +18,12 @@ IF CEF_VERSION == 1:
 
 cdef dict g_pyBrowsers = {}
 
-cdef PyBrowser GetPyBrowserById(int browserId):
-    if g_pyBrowsers.has_key(browserId):
-        return g_pyBrowsers[browserId]
-    return None
+IF CEF_VERSION == 3:
+    # Unused function warning in CEF 1.
+    cdef PyBrowser GetPyBrowserById(int browserId):
+        if g_pyBrowsers.has_key(browserId):
+            return g_pyBrowsers[browserId]
+        return None
 
 cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser):
     global g_pyBrowsers
@@ -79,16 +81,18 @@ cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser):
                         pyBrowser.SetJavascriptBindings(javascriptBindings)
     return pyBrowser
 
-cdef void RemovePyBrowser(int browserId) except *:
-    # Called from LifespanHandler_OnBeforeClose().
-    # TODO: call this function also in CEF 1, currently called only in CEF 3.
-    global g_pyBrowsers
-    if g_pyBrowsers.has_key(browserId):
-        Debug("del g_pyBrowsers[%s]" % browserId)
-        del g_pyBrowsers[browserId]
-    else:
-        Debug("RemovePyBrowser() FAILED: browser not found, id = %s" \
-                % browserId)
+IF CEF_VERSION == 3:
+    # Unused function warning in CEF 1.
+    cdef void RemovePyBrowser(int browserId) except *:
+        # Called from LifespanHandler_OnBeforeClose().
+        # TODO: call this function also in CEF 1.
+        global g_pyBrowsers
+        if g_pyBrowsers.has_key(browserId):
+            Debug("del g_pyBrowsers[%s]" % browserId)
+            del g_pyBrowsers[browserId]
+        else:
+            Debug("RemovePyBrowser() FAILED: browser not found, id = %s" \
+                    % browserId)
 
 cpdef PyBrowser GetBrowserByWindowHandle(WindowHandle windowHandle):
     cdef PyBrowser pyBrowser
diff --git a/cefpython/cef1/client_handler/client_handler.cpp b/cefpython/cef1/client_handler/client_handler.cpp
@@ -147,6 +147,8 @@ bool ClientHandler::GetDownloadHandler(
       const CefString& fileName,
       int64 contentLength,
       CefRefPtr<CefDownloadHandler>& handler) {
+  // Multiple downloads at the same time?
+  AutoLock lock_scope(this);
   REQUIRE_UI_THREAD();
   return RequestHandler_GetDownloadHandler(browser, mimeType, fileName, 
       contentLength, handler);
diff --git a/cefpython/cef1/client_handler/download_handler.cpp b/cefpython/cef1/client_handler/download_handler.cpp
@@ -9,13 +9,17 @@ bool DownloadHandler::ReceivedData(
         void* data,
         int data_size
         ) {
+    // Multiple downloads at the same time?
+    AutoLock lock_scope(this);
     REQUIRE_UI_THREAD();
     if (data_size == 0)
         return true;
     return DownloadHandler_ReceivedData(downloadHandlerId_, data, data_size);
 }
 
 void DownloadHandler::Complete() {
+    // Multiple downloads at the same time?
+    AutoLock lock_scope(this);
     REQUIRE_UI_THREAD();
     DownloadHandler_Complete(downloadHandlerId_);
 }
diff --git a/cefpython/cef1/client_handler/download_handler.h b/cefpython/cef1/client_handler/download_handler.h
@@ -25,4 +25,6 @@ class DownloadHandler : public CefDownloadHandler
 protected:
   // Include the default reference counting implementation.
   IMPLEMENT_REFCOUNTING(DownloadHandler);
+  // Include the default locking implementation.
+  IMPLEMENT_LOCKING(DownloadHandler);
 };
diff --git a/cefpython/cef3/linux/binaries_32bit/wxpython.html b/cefpython/cef3/linux/binaries_32bit/wxpython.html
@@ -359,7 +359,7 @@ <h3>Cookie tests</h3>
     # Create unique cookie manager for each browser.
     # --
     # Buggy implementation in CEF, reported here:
-    # http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10901
+    # https://code.google.com/p/chromiumembedded/issues/detail?id=1043
     cookieManager = browser.GetUserData("cookieManager")
     if cookieManager:
         return cookieManager
diff --git a/cefpython/cef3/linux/binaries_32bit/wxpython.py b/cefpython/cef3/linux/binaries_32bit/wxpython.py
@@ -334,7 +334,7 @@ def GetCookieManager(self, browser, mainUrl):
         # Create unique cookie manager for each browser.
         # --
         # Buggy implementation in CEF, reported here:
-        # http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10901
+        # https://code.google.com/p/chromiumembedded/issues/detail?id=1043
         cookieManager = browser.GetUserData("cookieManager")
         if cookieManager:
             return cookieManager
diff --git a/cefpython/cef3/linux/binaries_64bit/wxpython.html b/cefpython/cef3/linux/binaries_64bit/wxpython.html
@@ -359,7 +359,7 @@ <h3>Cookie tests</h3>
     # Create unique cookie manager for each browser.
     # --
     # Buggy implementation in CEF, reported here:
-    # http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10901
+    # https://code.google.com/p/chromiumembedded/issues/detail?id=1043
     cookieManager = browser.GetUserData("cookieManager")
     if cookieManager:
         return cookieManager
diff --git a/cefpython/cef3/linux/binaries_64bit/wxpython.py b/cefpython/cef3/linux/binaries_64bit/wxpython.py
@@ -334,7 +334,7 @@ def GetCookieManager(self, browser, mainUrl):
         # Create unique cookie manager for each browser.
         # --
         # Buggy implementation in CEF, reported here:
-        # http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10901
+        # https://code.google.com/p/chromiumembedded/issues/detail?id=1043
         cookieManager = browser.GetUserData("cookieManager")
         if cookieManager:
             return cookieManager
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -144,7 +144,7 @@ IF CEF_VERSION == 1:
     include "v8function_handler_cef1.pyx"
     include "v8utils_cef1.pyx"
     include "javascript_callback_cef1.pyx"
-    include "python_callback.pyx"
+    include "python_callback_cef1.pyx"
 
 IF CEF_VERSION == 3:
     include "process_message_utils.pyx"
diff --git a/cefpython/cookie_cef1.pyx b/cefpython/cookie_cef1.pyx
@@ -216,11 +216,10 @@ cdef class PyCookieManager:
             schemesVector.push_back(PyToCefStringValue(scheme))
         self.cefCookieManager.get().SetSupportedSchemes(schemesVector)
 
-    cdef cpp_bool ValidateUserCookieVisitor(self, object userCookieVisitor
-            ) except *:
-        if userCookieVisitor and hasattr(userCookieVisitor, "Visit") and (
-                callable(getattr(userCookieVisitor, "Visit"))):
-            return True
+    cdef py_void ValidateUserCookieVisitor(self, object userCookieVisitor):
+        if userCookieVisitor and hasattr(userCookieVisitor, "Visit") and \
+                callable(getattr(userCookieVisitor, "Visit")):
+            return
         raise Exception("CookieVisitor object is missing Visit() method")
 
     cpdef py_bool VisitAllCookies(self, object userCookieVisitor):
diff --git a/cefpython/frame.pyx b/cefpython/frame.pyx
@@ -4,10 +4,12 @@
 
 cdef dict g_pyFrames = {}
 
-cdef PyFrame GetPyFrameById(object frameId):
-    if g_pyFrames.has_key(frameId):
-        return g_pyFrames[frameId]
-    return None
+IF CEF_VERSION == 3:
+    # Unused function warning in CEF 1.
+    cdef PyFrame GetPyFrameById(object frameId):
+        if g_pyFrames.has_key(frameId):
+            return g_pyFrames[frameId]
+        return None
 
 cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
     global g_pyFrames
@@ -37,29 +39,31 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
     g_pyFrames[frameId] = pyFrame
     return pyFrame
 
-cdef void RemovePyFrame(int frameId) except *:
-    # Called from V8ContextHandler_OnContextReleased().
-    # TODO: call this function also in CEF 1, currently called only in CEF 3.
-    global g_pyFrames
-    if g_pyFrames.has_key(frameId):
-        Debug("del g_pyFrames[%s]" % frameId)
-        del g_pyFrames[frameId]
-    else:
-        Debug("RemovePyFrame() FAILED: frame not found, id = %s" % frameId)
-
-cdef void RemovePyFramesForBrowser(int browserId) except *:
-    # Called from LifespanHandler_BeforeClose().
-    # TODO: call this function also in CEF 1, currently called only in CEF 3.
-    cdef list toRemove = []
-    cdef object frameId
-    cdef PyFrame pyFrame
-    global g_pyFrames
-    for frameId, pyFrame in g_pyFrames.iteritems():
-        if pyFrame.GetBrowserIdentifier() == browserId:
-            toRemove.append(frameId)
-    for frameId in toRemove:
-        Debug("del g_pyFrames[%s]" % frameId)
-        del g_pyFrames[frameId]
+IF CEF_VERSION == 3:
+    # Unused function warning in CEF 1.
+    cdef void RemovePyFrame(int frameId) except *:
+        # Called from V8ContextHandler_OnContextReleased().
+        # TODO: call this function also in CEF 1.
+        global g_pyFrames
+        if g_pyFrames.has_key(frameId):
+            Debug("del g_pyFrames[%s]" % frameId)
+            del g_pyFrames[frameId]
+        else:
+            Debug("RemovePyFrame() FAILED: frame not found, id = %s" % frameId)
+
+    cdef void RemovePyFramesForBrowser(int browserId) except *:
+        # Called from LifespanHandler_BeforeClose().
+        # TODO: call this function also in CEF 1.
+        cdef list toRemove = []
+        cdef object frameId
+        cdef PyFrame pyFrame
+        global g_pyFrames
+        for frameId, pyFrame in g_pyFrames.iteritems():
+            if pyFrame.GetBrowserIdentifier() == browserId:
+                toRemove.append(frameId)
+        for frameId in toRemove:
+            Debug("del g_pyFrames[%s]" % frameId)
+            del g_pyFrames[frameId]
 
 cdef class PyFrame:
     cdef CefRefPtr[CefFrame] cefFrame
@@ -78,11 +82,12 @@ cdef class PyFrame:
         self.browserId = browserId
         self.frameId = frameId
 
-    cpdef cpp_bool IsValid(self) except *:
-        if <void*>self.cefFrame != NULL and self.cefFrame.get() \
-                and self.cefFrame.get().IsValid():
-            return True
-        return False
+    IF CEF_VERSION == 3:
+        cpdef cpp_bool IsValid(self) except *:
+            if <void*>self.cefFrame != NULL and self.cefFrame.get() \
+                    and self.cefFrame.get().IsValid():
+                return True
+            return False
 
     def ExecuteFunction(self, *args):
         # No need to enter V8 context as we're calling javascript
