Get rid of the CEF_VERSION compile time constant. Issue cztomczak#106.

cztomczak · cztomczak · commit a00c8a49940a · 2016-05-14T16:38:29.000+02:00
Update api/ docs.
diff --git a/api/API-index.md b/api/API-index.md
@@ -128,7 +128,6 @@
   * [GetModuleDirectory](cefpython.md#getmoduledirectory)
   * [Initialize](cefpython.md#initialize)
   * [IsThread](cefpython.md#isthread)
-  * [IsKeyModifier](cefpython.md#iskeymodifier)
   * [MessageLoop](cefpython.md#messageloop)
   * [MessageLoopWork](cefpython.md#messageloopwork)
   * [PostTask](cefpython.md#posttask)
diff --git a/api/cefpython.md b/api/cefpython.md
@@ -16,7 +16,6 @@ Table of contents:
   * [GetModuleDirectory](#getmoduledirectory)
   * [Initialize](#initialize)
   * [IsThread](#isthread)
-  * [IsKeyModifier](#iskeymodifier)
   * [MessageLoop](#messageloop)
   * [MessageLoopWork](#messageloopwork)
   * [PostTask](#posttask)
@@ -138,17 +137,6 @@ List of threads in the Renderer process:
 * TID_RENDERER: The main thread in the renderer. Used for all webkit and V8 interaction.
 
 
-### IsKeyModifier
-
-| Parameter | Type |
-| --- | --- |
-| key | int |
-| modifiers | int |
-| __Return__ | bool |
-
-For use with [KeyboardHandler](KeyboardHandler.md) to check whether ALT, SHIFT or CTRL are pressed.
-
-
 ### MessageLoop
 
 | | |
diff --git a/cefpython/browser.pyx b/cefpython/browser.pyx
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -137,15 +137,10 @@ include "browser.pyx"
 include "frame.pyx"
 
 include "settings.pyx"
-IF UNAME_SYSNAME == "Windows" and CEF_VERSION == 1:
-    # Off-screen rendering currently supported only on Windows
-    include "paint_buffer_cef1.pyx"
 
 IF UNAME_SYSNAME == "Windows":
     include "window_utils_win.pyx"
     include "dpi_aware_win.pyx"
-    IF CEF_VERSION == 1:
-        include "http_authentication_win.pyx"
 ELIF UNAME_SYSNAME == "Linux":
     include "window_utils_linux.pyx"
 ELIF UNAME_SYSNAME == "Darwin":
@@ -302,29 +297,27 @@ def Initialize(applicationSettings=None, commandLineSwitches=None):
     # CEF options - default values.
     if not "multi_threaded_message_loop" in applicationSettings:
         applicationSettings["multi_threaded_message_loop"] = False
-    IF CEF_VERSION == 3:
-        if not "single_process" in applicationSettings:
-            applicationSettings["single_process"] = False
+    if not "single_process" in applicationSettings:
+        applicationSettings["single_process"] = False
 
     cdef CefRefPtr[CefApp] cefApp
 
-    IF CEF_VERSION == 3:
-        cefApp = <CefRefPtr[CefApp]?>new CefPythonApp()
-        IF UNAME_SYSNAME == "Windows":
-            cdef HINSTANCE hInstance = GetModuleHandle(NULL)
-            cdef CefMainArgs cefMainArgs = CefMainArgs(hInstance)
-        ELIF UNAME_SYSNAME == "Linux":
-            # TODO: use the CefMainArgs(int argc, char** argv) constructor.
-            cdef CefMainArgs cefMainArgs
-        ELIF UNAME_SYSNAME == "Darwin":
-            # TODO: use the CefMainArgs(int argc, char** argv) constructor.
-            cdef CefMainArgs cefMainArgs
-        cdef int exitCode = 1
-        with nogil:
-            exitCode = CefExecuteProcess(cefMainArgs, cefApp)
-        Debug("CefExecuteProcess(): exitCode = %s" % exitCode)
-        if exitCode >= 0:
-            sys.exit(exitCode)
+    cefApp = <CefRefPtr[CefApp]?>new CefPythonApp()
+    IF UNAME_SYSNAME == "Windows":
+        cdef HINSTANCE hInstance = GetModuleHandle(NULL)
+        cdef CefMainArgs cefMainArgs = CefMainArgs(hInstance)
+    ELIF UNAME_SYSNAME == "Linux":
+        # TODO: use the CefMainArgs(int argc, char** argv) constructor.
+        cdef CefMainArgs cefMainArgs
+    ELIF UNAME_SYSNAME == "Darwin":
+        # TODO: use the CefMainArgs(int argc, char** argv) constructor.
+        cdef CefMainArgs cefMainArgs
+    cdef int exitCode = 1
+    with nogil:
+        exitCode = CefExecuteProcess(cefMainArgs, cefApp)
+    Debug("CefExecuteProcess(): exitCode = %s" % exitCode)
+    if exitCode >= 0:
+        sys.exit(exitCode)
 
     # Make a copy as applicationSettings is a reference only
     # that might get destroyed later.
@@ -345,12 +338,8 @@ def Initialize(applicationSettings=None, commandLineSwitches=None):
 
     Debug("CefInitialize()")
     cdef cpp_bool ret
-    IF CEF_VERSION == 1:
-        with nogil:
-            ret = CefInitialize(cefApplicationSettings, cefApp)
-    ELIF CEF_VERSION == 3:
-        with nogil:
-            ret = CefInitialize(cefMainArgs, cefApplicationSettings, cefApp)
+    with nogil:
+        ret = CefInitialize(cefMainArgs, cefApplicationSettings, cefApp)
 
     if not ret:
         Debug("CefInitialize() failed")
@@ -421,13 +410,6 @@ def CreateBrowserSync(windowInfo, browserSettings, navigateUrl, requestContext=N
     cdef PyBrowser pyBrowser = GetPyBrowser(cefBrowser)
     pyBrowser.SetUserData("__outerWindowHandle", int(windowInfo.parentWindowHandle))
 
-    # IF CEF_VERSION == 3:
-        # Test whether process message sent before renderer thread is created
-        # will be delivered - OK.
-        # Debug("Sending 'CreateBrowserSync() done' message to the Renderer")
-        # pyBrowser.SendProcessMessage(cef_types.PID_RENDERER,
-        #        "CreateBrowserSync() done")
-
     return pyBrowser
 
 def MessageLoop():
diff --git a/cefpython/cython_includes/cef_app.pxd b/cefpython/cython_includes/cef_app.pxd
@@ -12,32 +12,24 @@ from cef_ptr cimport CefRefPtr
 from cef_base cimport CefBase
 from libcpp cimport bool as cpp_bool
 
-IF CEF_VERSION == 3:
-    IF UNAME_SYSNAME == "Windows":
-        from cef_win cimport CefMainArgs
-    ELIF UNAME_SYSNAME == "Linux":
-        from cef_linux cimport CefMainArgs
-    ELIF UNAME_SYSNAME == "Darwin":
-        from cef_mac cimport CefMainArgs
+IF UNAME_SYSNAME == "Windows":
+    from cef_win cimport CefMainArgs
+ELIF UNAME_SYSNAME == "Linux":
+    from cef_linux cimport CefMainArgs
+ELIF UNAME_SYSNAME == "Darwin":
+    from cef_mac cimport CefMainArgs
 
 cdef extern from "include/cef_app.h":
 
     cdef cppclass CefApp(CefBase):
         pass
 
-    IF CEF_VERSION == 3:
-        cdef int CefExecuteProcess(CefMainArgs& args, CefRefPtr[CefApp] application) nogil
+    cdef int CefExecuteProcess(CefMainArgs& args, CefRefPtr[CefApp] application) nogil
 
-    IF CEF_VERSION == 1:
-        cdef cpp_bool CefInitialize(CefSettings&, CefRefPtr[CefApp]) nogil
-    ELIF CEF_VERSION == 3:
-        cdef cpp_bool CefInitialize(CefMainArgs&, CefSettings&, CefRefPtr[CefApp]) nogil
+    cdef cpp_bool CefInitialize(CefMainArgs&, CefSettings&, CefRefPtr[CefApp]) nogil
 
     cdef void CefRunMessageLoop() nogil
     cdef void CefDoMessageLoopWork() nogil
     cdef void CefQuitMessageLoop() nogil
     cdef void CefShutdown() nogil
-
-    IF CEF_VERSION == 3:
-        cdef void CefSetOSModalLoop(cpp_bool osModalLoop) nogil
-
+    cdef void CefSetOSModalLoop(cpp_bool osModalLoop) nogil
diff --git a/cefpython/cython_includes/cef_browser_static.pxd b/cefpython/cython_includes/cef_browser_static.pxd
@@ -18,25 +18,12 @@ from cef_browser cimport CefBrowser
 from libcpp cimport bool as cpp_bool
 from cef_string cimport CefString
 
-IF CEF_VERSION == 1:
-
-    # Specifying namespace allows to import a static method.
-    cdef extern from "include/cef_browser.h" namespace "CefBrowser":
-
-        cdef CefRefPtr[CefBrowser] CreateBrowserSync(
-            CefWindowInfo&,
-            CefRefPtr[CefClient],
-            CefString&,
-            CefBrowserSettings&) nogil
-
-ELIF CEF_VERSION == 3:
-
-    # Specifying namespace allows to import a static method.
-    cdef extern from "include/cef_browser.h" namespace "CefBrowserHost":
-
-        cdef CefRefPtr[CefBrowser] CreateBrowserSync(
-            CefWindowInfo&,
-            CefRefPtr[CefClient],
-            CefString&,
-            CefBrowserSettings&,
-            CefRefPtr[CefRequestContext]) nogil
+# Specifying namespace allows to import a static method.
+cdef extern from "include/cef_browser.h" namespace "CefBrowserHost":
+
+    cdef CefRefPtr[CefBrowser] CreateBrowserSync(
+        CefWindowInfo&,
+        CefRefPtr[CefClient],
+        CefString&,
+        CefBrowserSettings&,
+        CefRefPtr[CefRequestContext]) nogil
diff --git a/cefpython/cython_includes/cef_linux.pxd b/cefpython/cython_includes/cef_linux.pxd
@@ -19,8 +19,7 @@ cdef extern from "include/internal/cef_linux.h":
         void SetTransparentPainting(cpp_bool)
         void SetAsOffScreen(CefWindowHandle)        
 
-    IF CEF_VERSION == 3:
-        cdef cppclass CefMainArgs(CefStructBase):
-            CefMainArgs()
-            CefMainArgs(int argc_arg, char** argv_arg)
+    cdef cppclass CefMainArgs(CefStructBase):
+        CefMainArgs()
+        CefMainArgs(int argc_arg, char** argv_arg)
 
diff --git a/cefpython/cython_includes/cef_mac.pxd b/cefpython/cython_includes/cef_mac.pxd
@@ -19,7 +19,6 @@ cdef extern from "include/internal/cef_linux.h":
         void SetTransparentPainting(cpp_bool)
         void SetAsOffScreen(CefWindowHandle)
 
-    IF CEF_VERSION == 3:
-        cdef cppclass CefMainArgs(CefStructBase):
-            CefMainArgs()
-            CefMainArgs(int argc_arg, char** argv_arg)
+    cdef cppclass CefMainArgs(CefStructBase):
+        CefMainArgs()
+        CefMainArgs(int argc_arg, char** argv_arg)
diff --git a/cefpython/cython_includes/cef_types_wrappers.pxd b/cefpython/cython_includes/cef_types_wrappers.pxd
@@ -6,9 +6,8 @@ include "compile_time_constants.pxi"
 
 from libcpp cimport bool as cpp_bool
 from cef_string cimport cef_string_t
-IF CEF_VERSION == 3:
-      from cef_types cimport cef_state_t
-      from cef_types cimport cef_color_t
+from cef_types cimport cef_state_t
+from cef_types cimport cef_color_t
 
 cdef extern from "include/internal/cef_types_wrappers.h":
 
diff --git a/cefpython/cython_includes/cef_win.pxd b/cefpython/cython_includes/cef_win.pxd
@@ -20,9 +20,8 @@ cdef extern from "include/internal/cef_win.h":
         void SetTransparentPainting(int)
         void SetAsOffScreen(HWND)
 
-    IF CEF_VERSION == 3:
-        cdef cppclass CefMainArgs(CefStructBase):
-            CefMainArgs()
-            CefMainArgs(HINSTANCE hInstance)
+    cdef cppclass CefMainArgs(CefStructBase):
+        CefMainArgs()
+        CefMainArgs(HINSTANCE hInstance)
 
     ctypedef _cef_key_info_t CefKeyInfo
diff --git a/cefpython/javascript_bindings.pyx b/cefpython/javascript_bindings.pyx
@@ -80,78 +80,36 @@ cdef class JavascriptBindings:
         else:
             self.properties[name] = value
 
-
-    IF CEF_VERSION == 1:
-        cpdef py_void Rebind(self):
-            # Rebind may also be used for first-time bindings, in
-            # a case when v8 process/thread was created too fast,
-            # see Browser.SetJavascriptBindings() that checks whether
-            # OnContextCreated() event already happened, if so it will
-            # call Rebind() to do the javascript bindings.
-            assert IsThread(TID_UI), (
-                    "JavascriptBindings.Rebind() may only be called on UI thread")
-            cdef CefRefPtr[CefBrowser] cefBrowser
-            cdef CefRefPtr[CefFrame] cefFrame
-            cdef CefRefPtr[CefV8Context] v8Context
-            cdef cpp_bool sameContext
-            cdef PyBrowser pyBrowser
-            cdef PyFrame pyFrame
-            cdef list frames
-            global g_pyBrowsers
-            for pyBrowser in g_pyBrowsers:
-                # These javascript bindings may have been binded
-                # to many browsers.
-                if pyBrowser.GetJavascriptBindings() != self:
-                    continue
-                if self.bindToFrames:
-                    frames = pyBrowser.GetFrames()
-                else:
-                    frames = [pyBrowser.GetMainFrame()]
-                for frameId in self.frames:
-                    pyBrowser = self.frames[frameId][0]
-                    pyFrame = self.frames[frameId][1]
-                    cefBrowser = pyBrowser.GetCefBrowser()
-                    cefFrame = pyFrame.GetCefFrame()
-                    v8Context = cefFrame.get().GetV8Context()
-                    sameContext = v8Context.get().IsSame(cef_v8_static.GetCurrentContext())
-                    if not sameContext:
-                        Debug("JavascriptBindings.Rebind(): inside a different context, calling v8Context.Enter()")
-                        assert v8Context.get().Enter(), "v8Context.Enter() failed"
-                    V8ContextHandler_OnContextCreated(cefBrowser, cefFrame, v8Context)
-                    if not sameContext:
-                        assert v8Context.get().Exit(), "v8Context.Exit() failed"
-    ELIF CEF_VERSION == 3:
-        cpdef py_void Rebind(self):
-            # In CEF Python 3 due to its multi-process architecture
-            # Rebind() is used for both first-time binding and rebinding.
-            cdef PyBrowser pyBrowser
-            cdef dict functions
-            cdef dict properties
-            cdef dict objects
-            cdef dict methods
-            global g_pyBrowsers
-            for browserId, pyBrowser in g_pyBrowsers.iteritems():
-                if pyBrowser.GetJavascriptBindings() != self:
-                    continue
-                # Send to the Renderer process: functions, properties,
-                # objects and its methods, bindToFrames.
-                functions = {}
-                for funcName in self.functions:
-                    functions[funcName] = None
-                properties = self.properties
-                objects = {}
-                for objectName in self.objects:
-                    methods = {}
-                    for methodName in self.objects[objectName]:
-                        methods[methodName] = None
-                    objects[objectName] = methods
-                pyBrowser.SendProcessMessage(cef_types.PID_RENDERER,
-                        0, "DoJavascriptBindings", [{
-                                "functions": functions,
-                                "properties": properties,
-                                "objects": objects,
-                                "bindToFrames": self.bindToFrames
-                                }])
+    cpdef py_void Rebind(self):
+        # Rebind() is called for both first-time binding and rebinding.
+        cdef PyBrowser pyBrowser
+        cdef dict functions
+        cdef dict properties
+        cdef dict objects
+        cdef dict methods
+        global g_pyBrowsers
+        for browserId, pyBrowser in g_pyBrowsers.iteritems():
+            if pyBrowser.GetJavascriptBindings() != self:
+                continue
+            # Send to the Renderer process: functions, properties,
+            # objects and its methods, bindToFrames.
+            functions = {}
+            for funcName in self.functions:
+                functions[funcName] = None
+            properties = self.properties
+            objects = {}
+            for objectName in self.objects:
+                methods = {}
+                for methodName in self.objects[objectName]:
+                    methods[methodName] = None
+                objects[objectName] = methods
+            pyBrowser.SendProcessMessage(cef_types.PID_RENDERER,
+                    0, "DoJavascriptBindings", [{
+                            "functions": functions,
+                            "properties": properties,
+                            "objects": objects,
+                            "bindToFrames": self.bindToFrames
+                            }])
 
     cpdef dict GetProperties(self):
         return self.properties
diff --git a/cefpython/linux/setup/setup.py b/cefpython/linux/setup/setup.py
@@ -15,9 +15,6 @@
 # Stop on first error, otherwise hundreds of errors appear in the console.
 Options.fast_fail = True
 
-# Written to cython_includes/compile_time_constants.pxi
-CEF_VERSION = 3
-
 # Python version string: "27" or "32".
 PYTHON_VERSION = str(sys.version_info.major) + str(sys.version_info.minor)
 
@@ -28,7 +25,6 @@ def CompileTimeConstants():
         fd.write('# This file was generated by setup.py\n')
         # A way around Python 3.2 bug: UNAME_SYSNAME is not set.
         fd.write('DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0])
-        fd.write('DEF CEF_VERSION = %s\n' % CEF_VERSION)
         fd.write('DEF PY_MAJOR_VERSION = %s\n' % sys.version_info.major)
 
 CompileTimeConstants()
diff --git a/cefpython/mac/setup/setup.py b/cefpython/mac/setup/setup.py
@@ -23,9 +23,6 @@
 # Stop on first error, otherwise hundreds of errors appear in the console.
 Options.fast_fail = True
 
-# Written to cython_includes/compile_time_constants.pxi
-CEF_VERSION = 3
-
 # Python version string: "27" or "32".
 PYTHON_VERSION = str(sys.version_info.major) + str(sys.version_info.minor)
 
@@ -36,7 +33,6 @@ def CompileTimeConstants():
         fd.write('# This file was generated by setup.py\n')
         # A way around Python 3.2 bug: UNAME_SYSNAME is not set.
         fd.write('DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0])
-        fd.write('DEF CEF_VERSION = %s\n' % CEF_VERSION)
         fd.write('DEF PY_MAJOR_VERSION = %s\n' % sys.version_info.major)
 
 CompileTimeConstants()
diff --git a/cefpython/settings.pyx b/cefpython/settings.pyx
diff --git a/cefpython/utils.pyx b/cefpython/utils.pyx
diff --git a/cefpython/windows/setup/setup.py b/cefpython/windows/setup/setup.py
