Skip to content

Commit 75884b6

Browse files
cztomczakcztomczak
committed
Fix --fast build in compile.py and fix installing on system Python 2.7.
Test with Cython 0.24.1 on Python 2.7.
1 parent 53c6d7c commit 75884b6

File tree

3 files changed

+111
-82
lines changed

3 files changed

+111
-82
lines changed

‎src/cefpython_public_api.h‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
// d:\cefpython\src\setup/cefpython.h(22) : warning C4190: 'RequestHandler_GetCookieManager'
2-
// has C-linkage specified, but returns UDT 'CefRefPtr<T>' which is incompatible with C
1+
/* This is a wrapper around including cefpython.h that is generated
2+
by Cython. Functions marked with the 'public' keyword are exposed
3+
to C through that header file. */
34

45
#ifndef CEFPYTHON_PUBLIC_API_H
56
#define CEFPYTHON_PUBLIC_API_H
67

78
#if defined(OS_WIN)
8-
#pragma warning(disable:4190)
9+
#pragma warning(disable:4190) // cefpython.h extern C-linkage warnings
910
#endif
1011

11-
// To be able to use 'public' declarations you need to include Python.h and cefpython.h.
12-
// This include must be before including CEF, otherwise you get errors like:
13-
// | /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined
14-
// This file needs to be included first before CEF.
1512
#include "Python.h"
1613

17-
// All the imports that are required when including "cefpython.h".
18-
#include "include/cef_client.h"
19-
#include "include/cef_urlrequest.h"
20-
#include "include/cef_command_line.h"
21-
#include "util.h"
22-
23-
// Python 3.2 fix - DL_IMPORT is not defined in Python.h
24-
#ifndef DL_IMPORT /* declarations for DLL import/export */
14+
// cefpython.h declares public functions using DL_IMPORT and these
15+
// macros are not available in Python 3.
16+
#ifndef DL_IMPORT
2517
#define DL_IMPORT(RTYPE) RTYPE
2618
#endif
27-
#ifndef DL_EXPORT /* declarations for DLL import/export */
19+
#ifndef DL_EXPORT
2820
#define DL_EXPORT(RTYPE) RTYPE
2921
#endif
3022

23+
// Includes required by "cefpython.h".
24+
#include "include/cef_client.h"
25+
#include "include/cef_urlrequest.h"
26+
#include "include/cef_command_line.h"
27+
#include "util.h"
28+
29+
// cefpython.h include depending on platform
3130
#if defined(OS_WIN)
3231
#include "windows/setup/cefpython.h"
3332
#elif defined(OS_LINUX)
@@ -36,5 +35,4 @@
3635
#include "mac/setup/cefpython.h"
3736
#endif
3837

39-
// CEFPYTHON_PUBLIC_API_H
40-
#endif
38+
#endif // CEFPYTHON_PUBLIC_API_H

‎src/linux/compile.py‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
--fast Fast mode, don't delete C++ .o .a files, nor the setup/build/
1111
directory, and disable optimization flags when building
1212
the so/pyd module.
13+
--kivy Run Kivy example (don't install package)
1314
"""
1415

16+
# TODO: Check Cython version using info from tools/requirements.txt
17+
1518
import sys
1619
import os
1720
import glob
@@ -164,7 +167,12 @@
164167
ret = subprocess.call("python-dbg setup.py build_ext --inplace"
165168
" --cython-gdb", shell=True)
166169
else:
167-
ret = subprocess.call("python setup.py build_ext --inplace --fast", shell=True)
170+
if FAST:
171+
ret = subprocess.call("python setup.py build_ext --inplace --fast",
172+
shell=True)
173+
else:
174+
ret = subprocess.call("python setup.py build_ext --inplace",
175+
shell=True)
168176

169177
if DEBUG:
170178
shutil.rmtree("./../binaries_%s/cython_debug/" % BITS, ignore_errors=True)
@@ -196,9 +204,26 @@
196204
if KIVY:
197205
os.system("python binaries_64bit/kivy_.py")
198206
else:
199-
os.system("rm -rf ./installer/cefpython3-%s-*" % (VERSION,))
200-
subprocess.call("cd ./installer/ && python make-setup.py --version %s"
201-
" && cd cefpython3-%s-* && python setup.py install"
202-
" && cd ../../../../examples/"
203-
" && python hello_world.py && cd ../src/linux/"\
204-
% (VERSION,VERSION), shell=True)
207+
print("Make installer and run setup.py install...")
208+
209+
# Clean installer directory from previous run
210+
exit_code = os.system("rm -rf ./installer/cefpython3-{ver}-*-setup/"
211+
.format(ver=VERSION))
212+
if exit_code:
213+
os.system("sudo rm -rf ./installer/cefpython3-{ver}-*-setup/"
214+
.format(ver=VERSION))
215+
216+
# System python requires sudo when installing package
217+
if sys.executable in ["/usr/bin/python", "/usr/bin/python3"]:
218+
sudo = "sudo"
219+
else:
220+
sudo = ""
221+
222+
# Make installer, install, run hello world and return to initial dir
223+
os.system("cd ./installer/ && python make-setup.py --version {ver}"
224+
" && cd cefpython3-{ver}-*-setup/"
225+
" && {sudo} python setup.py install"
226+
" && cd ../ && {sudo} rm -rf ./cefpython3-{ver}-*-setup/"
227+
" && cd ../../../examples/"
228+
" && python hello_world.py && cd ../src/linux/"
229+
.format(ver=VERSION, sudo=sudo))

‎src/linux/setup/cefpython.h‎

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* Generated by Cython 0.24.1 */
2+
13
#ifndef __PYX_HAVE__cefpython_py27
24
#define __PYX_HAVE__cefpython_py27
35

@@ -12,71 +14,75 @@
1214
#endif
1315
#endif
1416

15-
__PYX_EXTERN_C DL_IMPORT(void) PyBrowser_ShowDevTools(CefRefPtr<CefBrowser>);
17+
#ifndef DL_IMPORT
18+
#define DL_IMPORT(_T) _T
19+
#endif
20+
21+
__PYX_EXTERN_C DL_IMPORT(void) PyBrowser_ShowDevTools(CefRefPtr<CefBrowser> );
1622
__PYX_EXTERN_C DL_IMPORT(void) PyTaskRunnable(int);
17-
__PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>);
23+
__PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextCreated(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> );
1824
__PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextReleased(int, int64);
19-
__PYX_EXTERN_C DL_IMPORT(void) V8FunctionHandler_Execute(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString &, CefRefPtr<CefListValue>);
25+
__PYX_EXTERN_C DL_IMPORT(void) V8FunctionHandler_Execute(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefString &, CefRefPtr<CefListValue> );
2026
__PYX_EXTERN_C DL_IMPORT(void) RemovePythonCallbacksForFrame(int);
21-
__PYX_EXTERN_C DL_IMPORT(bool) ExecutePythonCallback(CefRefPtr<CefBrowser>, int, CefRefPtr<CefListValue>);
22-
__PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString const &, CefString const &, cef_window_open_disposition_t, bool, int const , CefWindowInfo &, CefRefPtr<CefClient> &, CefBrowserSettings &, bool *);
23-
__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnAfterCreated(CefRefPtr<CefBrowser>);
24-
__PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_DoClose(CefRefPtr<CefBrowser>);
25-
__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnBeforeClose(CefRefPtr<CefBrowser>);
26-
__PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnAddressChange(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString const &);
27-
__PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnTitleChange(CefRefPtr<CefBrowser>, CefString const &);
28-
__PYX_EXTERN_C DL_IMPORT(bool) DisplayHandler_OnTooltip(CefRefPtr<CefBrowser>, CefString &);
29-
__PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnStatusMessage(CefRefPtr<CefBrowser>, CefString const &);
30-
__PYX_EXTERN_C DL_IMPORT(bool) DisplayHandler_OnConsoleMessage(CefRefPtr<CefBrowser>, CefString const &, CefString const &, int);
31-
__PYX_EXTERN_C DL_IMPORT(bool) KeyboardHandler_OnPreKeyEvent(CefRefPtr<CefBrowser>, CefKeyEvent const &, CefEventHandle, bool *);
32-
__PYX_EXTERN_C DL_IMPORT(bool) KeyboardHandler_OnKeyEvent(CefRefPtr<CefBrowser>, CefKeyEvent const &, CefEventHandle);
33-
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforeResourceLoad(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefRequest>);
34-
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforeBrowse(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefRequest>, bool);
35-
__PYX_EXTERN_C DL_IMPORT(CefRefPtr<CefResourceHandler>) RequestHandler_GetResourceHandler(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefRequest>);
36-
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnResourceRedirect(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString const &, CefString &, CefRefPtr<CefRequest>);
37-
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_GetAuthCredentials(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, bool, CefString const &, int, CefString const &, CefString const &, CefRefPtr<CefAuthCallback>);
38-
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnQuotaRequest(CefRefPtr<CefBrowser>, CefString const &, int64, CefRefPtr<CefRequestCallback>);
39-
__PYX_EXTERN_C DL_IMPORT(CefRefPtr<CefCookieManager>) RequestHandler_GetCookieManager(CefRefPtr<CefBrowser>, CefString const &);
40-
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnProtocolExecution(CefRefPtr<CefBrowser>, CefString const &, bool &);
41-
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforePluginLoad(CefRefPtr<CefBrowser>, CefString const &, CefString const &, CefString const &, CefRefPtr<CefWebPluginInfo>, cef_plugin_policy_t *);
42-
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnCertificateError(int, CefString const &, CefRefPtr<CefRequestCallback>);
43-
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnRendererProcessTerminated(CefRefPtr<CefBrowser>, cef_termination_status_t);
44-
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnPluginCrashed(CefRefPtr<CefBrowser>, CefString const &);
27+
__PYX_EXTERN_C DL_IMPORT(bool) ExecutePythonCallback(CefRefPtr<CefBrowser> , int, CefRefPtr<CefListValue> );
28+
__PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_OnBeforePopup(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefString const &, CefString const &, cef_window_open_disposition_t, bool, int const , CefWindowInfo &, CefRefPtr<CefClient> &, CefBrowserSettings &, bool *);
29+
__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnAfterCreated(CefRefPtr<CefBrowser> );
30+
__PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_DoClose(CefRefPtr<CefBrowser> );
31+
__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnBeforeClose(CefRefPtr<CefBrowser> );
32+
__PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnAddressChange(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefString const &);
33+
__PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnTitleChange(CefRefPtr<CefBrowser> , CefString const &);
34+
__PYX_EXTERN_C DL_IMPORT(bool) DisplayHandler_OnTooltip(CefRefPtr<CefBrowser> , CefString &);
35+
__PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnStatusMessage(CefRefPtr<CefBrowser> , CefString const &);
36+
__PYX_EXTERN_C DL_IMPORT(bool) DisplayHandler_OnConsoleMessage(CefRefPtr<CefBrowser> , CefString const &, CefString const &, int);
37+
__PYX_EXTERN_C DL_IMPORT(bool) KeyboardHandler_OnPreKeyEvent(CefRefPtr<CefBrowser> , CefKeyEvent const &, CefEventHandle, bool *);
38+
__PYX_EXTERN_C DL_IMPORT(bool) KeyboardHandler_OnKeyEvent(CefRefPtr<CefBrowser> , CefKeyEvent const &, CefEventHandle);
39+
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforeResourceLoad(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefRefPtr<CefRequest> );
40+
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforeBrowse(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefRefPtr<CefRequest> , bool);
41+
__PYX_EXTERN_C DL_IMPORT(CefRefPtr<CefResourceHandler> ) RequestHandler_GetResourceHandler(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefRefPtr<CefRequest> );
42+
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnResourceRedirect(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , CefString const &, CefString &, CefRefPtr<CefRequest> );
43+
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_GetAuthCredentials(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , bool, CefString const &, int, CefString const &, CefString const &, CefRefPtr<CefAuthCallback> );
44+
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnQuotaRequest(CefRefPtr<CefBrowser> , CefString const &, int64, CefRefPtr<CefRequestCallback> );
45+
__PYX_EXTERN_C DL_IMPORT(CefRefPtr<CefCookieManager> ) RequestHandler_GetCookieManager(CefRefPtr<CefBrowser> , CefString const &);
46+
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnProtocolExecution(CefRefPtr<CefBrowser> , CefString const &, bool &);
47+
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforePluginLoad(CefRefPtr<CefBrowser> , CefString const &, CefString const &, CefString const &, CefRefPtr<CefWebPluginInfo> , cef_plugin_policy_t *);
48+
__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnCertificateError(int, CefString const &, CefRefPtr<CefRequestCallback> );
49+
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnRendererProcessTerminated(CefRefPtr<CefBrowser> , cef_termination_status_t);
50+
__PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnPluginCrashed(CefRefPtr<CefBrowser> , CefString const &);
4551
__PYX_EXTERN_C DL_IMPORT(bool) CookieVisitor_Visit(int, CefCookie const &, int, int, bool &);
4652
__PYX_EXTERN_C DL_IMPORT(void) StringVisitor_Visit(int, CefString const &);
47-
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadingStateChange(CefRefPtr<CefBrowser>, bool, bool, bool);
48-
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadStart(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>);
49-
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadEnd(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, int);
50-
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadError(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, cef_errorcode_t, CefString const &, CefString const &);
51-
__PYX_EXTERN_C DL_IMPORT(void) BrowserProcessHandler_OnRenderProcessThreadCreated(CefRefPtr<CefListValue>);
52-
__PYX_EXTERN_C DL_IMPORT(void) BrowserProcessHandler_OnBeforeChildProcessLaunch(CefRefPtr<CefCommandLine>);
53-
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetRootScreenRect(CefRefPtr<CefBrowser>, CefRect &);
54-
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetViewRect(CefRefPtr<CefBrowser>, CefRect &);
55-
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetScreenRect(CefRefPtr<CefBrowser>, CefRect &);
56-
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetScreenPoint(CefRefPtr<CefBrowser>, int, int, int &, int &);
57-
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetScreenInfo(CefRefPtr<CefBrowser>, CefScreenInfo &);
58-
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPopupShow(CefRefPtr<CefBrowser>, bool);
59-
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPopupSize(CefRefPtr<CefBrowser>, CefRect const &);
60-
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPaint(CefRefPtr<CefBrowser>, cef_paint_element_type_t, std::vector<CefRect> &, void const *, int, int);
61-
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnCursorChange(CefRefPtr<CefBrowser>, CefCursorHandle);
62-
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnScrollOffsetChanged(CefRefPtr<CefBrowser>);
63-
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_StartDragging(CefRefPtr<CefBrowser>, CefRefPtr<CefDragData>, PY_LONG_LONG, int, int);
64-
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_UpdateDragCursor(CefRefPtr<CefBrowser>, PY_LONG_LONG);
65-
__PYX_EXTERN_C DL_IMPORT(bool) ResourceHandler_ProcessRequest(int, CefRefPtr<CefRequest>, CefRefPtr<CefCallback>);
66-
__PYX_EXTERN_C DL_IMPORT(void) ResourceHandler_GetResponseHeaders(int, CefRefPtr<CefResponse>, int64 &, CefString &);
67-
__PYX_EXTERN_C DL_IMPORT(bool) ResourceHandler_ReadResponse(int, void *, int, int &, CefRefPtr<CefCallback>);
53+
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadingStateChange(CefRefPtr<CefBrowser> , bool, bool, bool);
54+
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadStart(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> );
55+
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadEnd(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , int);
56+
__PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadError(CefRefPtr<CefBrowser> , CefRefPtr<CefFrame> , cef_errorcode_t, CefString const &, CefString const &);
57+
__PYX_EXTERN_C DL_IMPORT(void) BrowserProcessHandler_OnRenderProcessThreadCreated(CefRefPtr<CefListValue> );
58+
__PYX_EXTERN_C DL_IMPORT(void) BrowserProcessHandler_OnBeforeChildProcessLaunch(CefRefPtr<CefCommandLine> );
59+
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetRootScreenRect(CefRefPtr<CefBrowser> , CefRect &);
60+
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetViewRect(CefRefPtr<CefBrowser> , CefRect &);
61+
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetScreenRect(CefRefPtr<CefBrowser> , CefRect &);
62+
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetScreenPoint(CefRefPtr<CefBrowser> , int, int, int &, int &);
63+
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_GetScreenInfo(CefRefPtr<CefBrowser> , CefScreenInfo &);
64+
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPopupShow(CefRefPtr<CefBrowser> , bool);
65+
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPopupSize(CefRefPtr<CefBrowser> , CefRect const &);
66+
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPaint(CefRefPtr<CefBrowser> , cef_paint_element_type_t, std::vector<CefRect> &, void const *, int, int);
67+
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnCursorChange(CefRefPtr<CefBrowser> , CefCursorHandle);
68+
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnScrollOffsetChanged(CefRefPtr<CefBrowser> );
69+
__PYX_EXTERN_C DL_IMPORT(bool) RenderHandler_StartDragging(CefRefPtr<CefBrowser> , CefRefPtr<CefDragData> , PY_LONG_LONG, int, int);
70+
__PYX_EXTERN_C DL_IMPORT(void) RenderHandler_UpdateDragCursor(CefRefPtr<CefBrowser> , PY_LONG_LONG);
71+
__PYX_EXTERN_C DL_IMPORT(bool) ResourceHandler_ProcessRequest(int, CefRefPtr<CefRequest> , CefRefPtr<CefCallback> );
72+
__PYX_EXTERN_C DL_IMPORT(void) ResourceHandler_GetResponseHeaders(int, CefRefPtr<CefResponse> , int64 &, CefString &);
73+
__PYX_EXTERN_C DL_IMPORT(bool) ResourceHandler_ReadResponse(int, void *, int, int &, CefRefPtr<CefCallback> );
6874
__PYX_EXTERN_C DL_IMPORT(bool) ResourceHandler_CanGetCookie(int, CefCookie const &);
6975
__PYX_EXTERN_C DL_IMPORT(bool) ResourceHandler_CanSetCookie(int, CefCookie const &);
7076
__PYX_EXTERN_C DL_IMPORT(void) ResourceHandler_Cancel(int);
71-
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnUploadProgress(int, CefRefPtr<CefURLRequest>, int64, int64);
72-
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnDownloadProgress(int, CefRefPtr<CefURLRequest>, int64, int64);
73-
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnDownloadData(int, CefRefPtr<CefURLRequest>, void const *, size_t);
74-
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnRequestComplete(int, CefRefPtr<CefURLRequest>);
75-
__PYX_EXTERN_C DL_IMPORT(void) App_OnBeforeCommandLineProcessing_BrowserProcess(CefRefPtr<CefCommandLine>);
76-
__PYX_EXTERN_C DL_IMPORT(bool) JavascriptDialogHandler_OnJavascriptDialog(CefRefPtr<CefBrowser>, CefString const &, cef_jsdialog_type_t, CefString const &, CefString const &, CefRefPtr<CefJSDialogCallback>, bool &);
77-
__PYX_EXTERN_C DL_IMPORT(bool) JavascriptDialogHandler_OnBeforeUnloadJavascriptDialog(CefRefPtr<CefBrowser>, CefString const &, bool, CefRefPtr<CefJSDialogCallback>);
78-
__PYX_EXTERN_C DL_IMPORT(void) JavascriptDialogHandler_OnResetJavascriptDialogState(CefRefPtr<CefBrowser>);
79-
__PYX_EXTERN_C DL_IMPORT(void) JavascriptDialogHandler_OnJavascriptDialogClosed(CefRefPtr<CefBrowser>);
77+
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnUploadProgress(int, CefRefPtr<CefURLRequest> , int64, int64);
78+
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnDownloadProgress(int, CefRefPtr<CefURLRequest> , int64, int64);
79+
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnDownloadData(int, CefRefPtr<CefURLRequest> , void const *, size_t);
80+
__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnRequestComplete(int, CefRefPtr<CefURLRequest> );
81+
__PYX_EXTERN_C DL_IMPORT(void) App_OnBeforeCommandLineProcessing_BrowserProcess(CefRefPtr<CefCommandLine> );
82+
__PYX_EXTERN_C DL_IMPORT(bool) JavascriptDialogHandler_OnJavascriptDialog(CefRefPtr<CefBrowser> , CefString const &, cef_jsdialog_type_t, CefString const &, CefString const &, CefRefPtr<CefJSDialogCallback> , bool &);
83+
__PYX_EXTERN_C DL_IMPORT(bool) JavascriptDialogHandler_OnBeforeUnloadJavascriptDialog(CefRefPtr<CefBrowser> , CefString const &, bool, CefRefPtr<CefJSDialogCallback> );
84+
__PYX_EXTERN_C DL_IMPORT(void) JavascriptDialogHandler_OnResetJavascriptDialogState(CefRefPtr<CefBrowser> );
85+
__PYX_EXTERN_C DL_IMPORT(void) JavascriptDialogHandler_OnJavascriptDialogClosed(CefRefPtr<CefBrowser> );
8086
__PYX_EXTERN_C DL_IMPORT(void) cefpython_GetDebugOptions(bool *, std::string *);
8187
__PYX_EXTERN_C DL_IMPORT(bool) ApplicationSettings_GetBool(char const *);
8288
__PYX_EXTERN_C DL_IMPORT(bool) ApplicationSettings_GetBoolFromDict(char const *, char const *);

0 commit comments

Comments
 (0)