Remove CEF 1 code path (continued, Issue #106).

Update unicode comments in string_utils.pyx.
cztomczak · Apr 21, 2016 · ab5c208 · ab5c208
1 parent a7e3bd0
commit ab5c208
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 453 deletions.
diff --git a/cefpython/browser.pyx b/cefpython/browser.pyx
@@ -312,11 +312,6 @@ cdef class PyBrowser:
     cpdef py_bool CanGoForward(self):
         return self.GetCefBrowser().get().CanGoForward()
 
-    IF CEF_VERSION == 1:
-
-        cpdef object ClearHistory(self):
-            self.GetCefBrowser().get().ClearHistory()
-
     cpdef py_void ParentWindowWillClose(self):
         IF CEF_VERSION == 1:
             self.GetCefBrowser().get().ParentWindowWillClose()

diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -89,6 +89,12 @@
 # - Always import bool from libcpp as cpp_bool, if you import it as
 #   "bool" in a pxd file, then Cython will complain about bool casts
 #   like "bool(1)" being invalid, in pyx files.
+#
+# - malloc example code:
+#   from libc.stdlib cimport malloc, free
+#   cdef RECT* rect = <RECT*>malloc(sizeof(RECT))
+#   free(rect)
+#
 
 # All .pyx files need to be included in this file.
 # Includes being made in other .pyx files are allowed to help

diff --git a/cefpython/cython_includes/cef_browser.pxd b/cefpython/cython_includes/cef_browser.pxd
@@ -15,11 +15,7 @@ cimport cef_types
 from cef_platform cimport CefKeyInfo
 from cef_types cimport int64
 
-IF CEF_VERSION == 1:
-    from cef_types_wrappers cimport CefRect
-
-IF CEF_VERSION == 3:
-    from cef_process_message cimport CefProcessMessage, CefProcessId
+from cef_process_message cimport CefProcessMessage, CefProcessId
 
 IF UNAME_SYSNAME == "Windows":
     from cef_win cimport CefWindowHandle, CefWindowInfo
@@ -30,136 +26,61 @@ ELIF UNAME_SYSNAME == "Darwin":
 
 cdef extern from "include/cef_browser.h":
 
-    IF CEF_VERSION == 1:
-
-        cdef cppclass CefBrowser(CefBase):
-
-            cpp_bool CanGoBack()
-            cpp_bool CanGoForward()
-            void ClearHistory()
-            void CloseBrowser()
-            void CloseDevTools()
-            void Find(int identifier, CefString& searchText, cpp_bool forward,
-                    cpp_bool matchCase, cpp_bool findNext)
-            CefRefPtr[CefFrame] GetFocusedFrame()
-            CefRefPtr[CefFrame] GetFrame(CefString& name)
-            void GetFrameNames(cpp_vector[CefString]& names)
-            CefRefPtr[CefFrame] GetMainFrame()
-            CefWindowHandle GetOpenerWindowHandle()
-            CefWindowHandle GetWindowHandle()
-            double GetZoomLevel()
-            void GoBack()
-            void GoForward()
-            cpp_bool HasDocument()
-            void HidePopup()
-            cpp_bool IsPopup()
-            void ParentWindowWillClose()
-            void Reload()
-            void ReloadIgnoreCache()
-            void SetFocus(cpp_bool enable)
-            void SetZoomLevel(double zoomLevel)
-            void ShowDevTools()
-            void StopLoad()
-            void StopFinding(cpp_bool clearSelection)
-            cpp_bool IsWindowRenderingDisabled()
-            cpp_bool IsPopupVisible()
-            int GetIdentifier()
-
-            # Off-screen rendering.
-
-            cpp_bool GetSize(cef_types.cef_paint_element_type_t type,
-                           int& width, int& height)
-            void SetSize(cef_types.cef_paint_element_type_t type,
-                         int width, int height)
-            void Invalidate(CefRect& dirtyRect)
-            cpp_bool GetImage(cef_types.cef_paint_element_type_t type,
-                          int width, int height, void* buffer)
-
-            # Sending mouse/key events.
-            void SendKeyEvent(cef_types.cef_key_type_t type,
-                    CefKeyInfo& keyInfo, int modifiers)
-            void SendMouseClickEvent(int x, int y,
-                    cef_types.cef_mouse_button_type_t type,
-                    cpp_bool mouseUp, int clickCount)
-            void SendMouseMoveEvent(int x, int y, cpp_bool mouseLeave)
-            void SendMouseWheelEvent(int x, int y, int deltaX, int deltaY)
-            void SendFocusEvent(cpp_bool setFocus)
-            void SendCaptureLostEvent()
-
-            # virtual CefRefPtr<CefClient> GetClient() =0;
-
-    ELIF CEF_VERSION == 3:
-
-        cdef cppclass CefBrowserHost(CefBase):
-
-            void CloseBrowser(cpp_bool force_close)
-            void ParentWindowWillClose()
-            CefRefPtr[CefBrowser] GetBrowser()
-            void SetFocus(cpp_bool enable)
-            CefWindowHandle GetWindowHandle()
-            CefWindowHandle GetOpenerWindowHandle()
-            double GetZoomLevel()
-            void SetZoomLevel(double zoomLevel)
-
-            CefString GetDevToolsURL(cpp_bool http_scheme)
-            # virtual void RunFileDialog(FileDialogMode mode,
-            #                 const CefString& title,
-            #                 const CefString& default_file_name,
-            #                 const std::vector<CefString>& accept_types,
-            #                 CefRefPtr<CefRunFileDialogCallback> callback) =0;
-            # typedef cef_file_dialog_mode_t FileDialogMode;
-
-            void StartDownload(const CefString& url)
-            void SetMouseCursorChangeDisabled(cpp_bool disabled)
-            cpp_bool IsMouseCursorChangeDisabled()
-            cpp_bool IsWindowRenderingDisabled()
-            void WasResized()
-            void WasHidden(cpp_bool hidden)
-            void NotifyScreenInfoChanged()
-
-            # Sending mouse/key events.
-            void SendKeyEvent(cef_types.CefKeyEvent)
-            void SendMouseClickEvent(cef_types.CefMouseEvent,
-                    cef_types.cef_mouse_button_type_t type,
-                    cpp_bool mouseUp, int clickCount)
-            void SendMouseMoveEvent(cef_types.CefMouseEvent, \
-                    cpp_bool mouseLeave)
-            void SendMouseWheelEvent(cef_types.CefMouseEvent, int deltaX, \
-                    int deltaY)
-            void SendFocusEvent(cpp_bool setFocus)
-            void SendCaptureLostEvent()
-
-            void Find(int identifier, const CefString& searchText, cpp_bool forward,
-                    cpp_bool matchCase, cpp_bool findNext)
-            void StopFinding(cpp_bool clearSelection)
-            void Print()
-
-        cdef cppclass CefBrowser(CefBase):
-
-            CefRefPtr[CefBrowserHost] GetHost()
-            cpp_bool CanGoBack()
-            cpp_bool CanGoForward()
-            CefRefPtr[CefFrame] GetFocusedFrame()
-            CefRefPtr[CefFrame] GetFrame(CefString& name)
-            CefRefPtr[CefFrame] GetFrame(int64 identifier)
-            void GetFrameNames(cpp_vector[CefString]& names)
-            CefRefPtr[CefFrame] GetMainFrame()
-            void GoBack()
-            void GoForward()
-            cpp_bool HasDocument()
-            cpp_bool IsPopup()
-            void Reload()
-            void ReloadIgnoreCache()
-            void StopLoad()
-            cpp_bool IsLoading()
-            int GetIdentifier()
-
-            # CefRefPtr<CefFrame> GetFrame(int64 identifier) =0;
-            # virtual CefRefPtr<CefClient> GetClient() =0;
-            cpp_bool SendProcessMessage(CefProcessId target_process,
-                                        CefRefPtr[CefProcessMessage] message)
-
-        # class CefRunFileDialogCallback : public virtual CefBase {
-        #    virtual void OnFileDialogDismissed(
-        #    CefRefPtr<CefBrowserHost> browser_host,
-        #    const std::vector<CefString>& file_paths) =0;
+    cdef cppclass CefBrowserHost(CefBase):
+
+        void CloseBrowser(cpp_bool force_close)
+        void ParentWindowWillClose()
+        CefRefPtr[CefBrowser] GetBrowser()
+        void SetFocus(cpp_bool enable)
+        CefWindowHandle GetWindowHandle()
+        CefWindowHandle GetOpenerWindowHandle()
+        double GetZoomLevel()
+        void SetZoomLevel(double zoomLevel)
+
+        CefString GetDevToolsURL(cpp_bool http_scheme)
+
+        void StartDownload(const CefString& url)
+        void SetMouseCursorChangeDisabled(cpp_bool disabled)
+        cpp_bool IsMouseCursorChangeDisabled()
+        cpp_bool IsWindowRenderingDisabled()
+        void WasResized()
+        void WasHidden(cpp_bool hidden)
+        void NotifyScreenInfoChanged()
+
+        void SendKeyEvent(cef_types.CefKeyEvent)
+        void SendMouseClickEvent(cef_types.CefMouseEvent,
+                cef_types.cef_mouse_button_type_t type,
+                cpp_bool mouseUp, int clickCount)
+        void SendMouseMoveEvent(cef_types.CefMouseEvent, \
+                cpp_bool mouseLeave)
+        void SendMouseWheelEvent(cef_types.CefMouseEvent, int deltaX, \
+                int deltaY)
+        void SendFocusEvent(cpp_bool setFocus)
+        void SendCaptureLostEvent()
+
+        void Find(int identifier, const CefString& searchText, cpp_bool forward,
+                cpp_bool matchCase, cpp_bool findNext)
+        void StopFinding(cpp_bool clearSelection)
+        void Print()
+
+    cdef cppclass CefBrowser(CefBase):
+
+        CefRefPtr[CefBrowserHost] GetHost()
+        cpp_bool CanGoBack()
+        cpp_bool CanGoForward()
+        CefRefPtr[CefFrame] GetFocusedFrame()
+        CefRefPtr[CefFrame] GetFrame(CefString& name)
+        CefRefPtr[CefFrame] GetFrame(int64 identifier)
+        void GetFrameNames(cpp_vector[CefString]& names)
+        CefRefPtr[CefFrame] GetMainFrame()
+        void GoBack()
+        void GoForward()
+        cpp_bool HasDocument()
+        cpp_bool IsPopup()
+        void Reload()
+        void ReloadIgnoreCache()
+        void StopLoad()
+        cpp_bool IsLoading()
+        int GetIdentifier()
+        cpp_bool SendProcessMessage(CefProcessId target_process,
+                                    CefRefPtr[CefProcessMessage] message)
diff --git a/cefpython/cython_includes/cef_types_win.pxd b/cefpython/cython_includes/cef_types_win.pxd
@@ -6,12 +6,6 @@ from windows cimport BOOL
 
 cdef extern from "include/internal/cef_types_win.h":
 
-    cdef enum cef_graphics_implementation_t:
-        ANGLE_IN_PROCESS = 0,
-        ANGLE_IN_PROCESS_COMMAND_BUFFER,
-        DESKTOP_IN_PROCESS,
-        DESKTOP_IN_PROCESS_COMMAND_BUFFER,
-
     ctypedef struct _cef_key_info_t:
         int key
         BOOL sysChar