+1054
-512
lines changedFilter options
+1054
-512
lines changed Original file line number Diff line number Diff line change
@@ -61,7 +61,6 @@ There will be no "window.opener" property available in the popup window.
61 61 62 62
`WindowOpenDisposition` constants in the cefpython module:
63 63
* WOD_UNKNOWN,
64 -
* WOD_SUPPRESS_OPEN,
65 64
* WOD_CURRENT_TAB,
66 65
* WOD_SINGLETON_TAB,
67 66
* WOD_NEW_FOREGROUND_TAB,
@@ -109,12 +109,16 @@ and [WebRequest](WebRequest.md) / [WebRequestClient](WebRequestClient.md). For a
109 109
| oldUrl | string |
110 110
| out newUrl[0] | string |
111 111
| request | [Request](Request.md) |
112 +
| response | [Response](Response.md) |
112 113
| __Return__ | void |
113 114 114 -
Called on the IO thread when a resource load is redirected. The |request|
115 -
parameter will contain the old URL and other request-related information.
116 -
The |new_url| parameter will contain the new URL and can be changed if
117 -
desired. The |request| object cannot be modified in this callback.
115 +
Description from upstream CEF:
116 +
> Called on the IO thread when a resource load is redirected. The |request|
117 +
> parameter will contain the old URL and other request-related information.
118 +
> The |response| parameter will contain the response that resulted in the
119 +
> redirect. The |new_url| parameter will contain the new URL and can be
120 +
> changed if desired. The |request| object cannot be modified in this
121 +
> callback.
118 122 119 123 120 124
### GetAuthCredentials
@@ -21,7 +21,7 @@ listed on this page.
21 21 22 22 23 23
Table of contents:
24 -
* [Build CEF Python 53 BETA on Linux](#build-cef-python-51-beta-on-linux)
24 +
* [Build CEF Python on Linux](#build-cef-python-on-linux)
25 25
* [Requirements](#requirements)
26 26
* [Build CEF Python using prebuilt CEF binaries](#build-cef-python-using-prebuilt-cef-binaries)
27 27
* [Build both CEF Python and CEF from sources](#build-both-cef-python-and-cef-from-sources)
@@ -30,10 +30,10 @@ Table of contents:
30 30
* [How to patch](#how-to-patch)
31 31 32 32 33 -
## Build CEF Python 53 BETA on Linux
33 +
## Build CEF Python on Linux
34 34 35 -
Complete steps for building CEF Python 53 using prebuilt
36 -
binaries from GH releases.
35 +
Complete steps for building CEF Python 54 using prebuilt
36 +
binaries from GitHub releases:
37 37 38 38
1) Tested and works fine on Ubuntu 14.04 64-bit (cmake 2.8.12 and g++ 4.8.4)
39 39
@@ -48,22 +48,17 @@ binaries from GH releases.
48 48 49 49
5) Download 64-bit Linux binaries and libraries from
50 50
[GH releases](https://github.com/cztomczak/cefpython/releases)
51 -
tagged 'v53-upstream'.
51 +
tagged 'v54-upstream'.
52 52 53 +
6) Extract it in the cefpython/build/ directory and rename the extracted
54 +
directory to "cef_linux64".
53 55 54 -
6) Copy "bin/*" to "cefpython/src/linux/binaries_64bit/"
55 - 56 -
7) Copy "lib/*" to "cefpython/src/linux/setup/lib_64bit/" (create dir)
57 - 58 -
8) Build cefpython:
56 +
8) Build cefpython and run examples:
59 57
```
60 58
cd cefpython/src/linux/
61 -
python compile.py 53.1
59 +
python compile.py 54.0
62 60
```
63 61 64 -
9) As of writing only "pygtk_.py" and "kivy_.py" examples are working
65 - 66 - 67 62
## Requirements
68 63 69 64
Below are platform specific requirements. Do these first before
@@ -170,12 +165,9 @@ need to customize the build then use the --help flag to see more.
170 165
cd ~/cefpython/
171 166
mkdir build/ && cd build
172 167
python ../tools/automate.py --build-cef --ninja-jobs 6
173 -
cd cef*_*_linux64/
174 -
cp bin/* ../../../src/linux/binaries_64bit/
175 -
mkdir ../../../src/linux/setup/lib_64bit/
176 -
cp lib/* ../../../src/linux/setup/lib_64bit/
168 +
mv cef*_*_linux64/ cef_linux64/
177 169
cd ../../../src/linux/
178 -
python compile.py 51.0
170 +
python compile.py 54.0
179 171
```
180 172 181 173
__MISSING PACKAGES (Linux)__: After the chromium sources are downloaded,
@@ -83,10 +83,10 @@ index 6a75930..ad620d7 100644
83 83
+ return PathService::Override(pref_key, file_path);
84 84
+}
85 85
diff --git libcef_dll/libcef_dll.cc libcef_dll/libcef_dll.cc
86 -
index cde4fde..7a5b13a 100644
86 +
index 208333c..fcadb7e 100644
87 87
--- libcef_dll/libcef_dll.cc
88 88
+++ libcef_dll/libcef_dll.cc
89 -
@@ -739,6 +739,23 @@ CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path) {
89 +
@@ -747,6 +747,23 @@ CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path) {
90 90
return _retval;
91 91
}
92 92
@@ -111,10 +111,10 @@ index cde4fde..7a5b13a 100644
111 111
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
112 112 113 113
diff --git libcef_dll/wrapper/libcef_dll_wrapper.cc libcef_dll/wrapper/libcef_dll_wrapper.cc
114 -
index 74827e3..cf35e11 100644
114 +
index 248a285..3f0c226 100644
115 115
--- libcef_dll/wrapper/libcef_dll_wrapper.cc
116 116
+++ libcef_dll/wrapper/libcef_dll_wrapper.cc
117 -
@@ -683,6 +683,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
117 +
@@ -691,6 +691,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
118 118
return _retval?true:false;
119 119
}
120 120
@@ -71,7 +71,7 @@ index 8f8094b..8b4602b 100644
71 71 72 72
#endif // CEF_INCLUDE_CEF_DRAG_DATA_H_
73 73
diff --git libcef/browser/osr/web_contents_view_osr.cc libcef/browser/osr/web_contents_view_osr.cc
74 -
index 574c22b..5a04fb1 100644
74 +
index 52f1a87..e967865 100644
75 75
--- libcef/browser/osr/web_contents_view_osr.cc
76 76
+++ libcef/browser/osr/web_contents_view_osr.cc
77 77
@@ -6,6 +6,7 @@
@@ -82,7 +82,7 @@ index 574c22b..5a04fb1 100644
82 82
#include "libcef/browser/osr/render_widget_host_view_osr.h"
83 83
#include "libcef/common/drag_data_impl.h"
84 84 85 -
@@ -220,7 +221,9 @@ void CefWebContentsViewOSR::StartDragging(
85 +
@@ -227,7 +228,9 @@ void CefWebContentsViewOSR::StartDragging(
86 86
if (browser.get())
87 87
handler = browser->GetClient()->GetRenderHandler();
88 88
if (handler.get()) {
@@ -43,11 +43,12 @@ CefRefPtr<CefResourceHandler> RequestHandler::GetResourceHandler(
43 43
void RequestHandler::OnResourceRedirect(CefRefPtr<CefBrowser> browser,
44 44
CefRefPtr<CefFrame> frame,
45 45
CefRefPtr<CefRequest> request,
46 +
CefRefPtr<CefResponse> response,
46 47
CefString& new_url)
47 48
{
48 49
REQUIRE_IO_THREAD();
49 50
RequestHandler_OnResourceRedirect(browser, frame, request->GetURL(),
50 -
new_url, request);
51 +
new_url, request, response);
51 52
}
52 53 53 54
@@ -31,6 +31,7 @@ class RequestHandler : public CefRequestHandler
31 31
void OnResourceRedirect(CefRefPtr<CefBrowser> browser,
32 32
CefRefPtr<CefFrame> frame,
33 33
CefRefPtr<CefRequest> request,
34 +
CefRefPtr<CefResponse> response,
34 35
CefString& new_url) override;
35 36 36 37
bool GetAuthCredentials(CefRefPtr<CefBrowser> browser,
@@ -309,7 +309,6 @@ cdef extern from "include/internal/cef_types.h":
309 309 310 310
ctypedef enum cef_window_open_disposition_t:
311 311
WOD_UNKNOWN,
312 -
WOD_SUPPRESS_OPEN,
313 312
WOD_CURRENT_TAB,
314 313
WOD_SINGLETON_TAB,
315 314
WOD_NEW_FOREGROUND_TAB,
@@ -11,7 +11,6 @@ cimport cef_types
11 11 12 12
# WindowOpenDisposition
13 13
WOD_UNKNOWN = cef_types.WOD_UNKNOWN
14 -
WOD_SUPPRESS_OPEN = cef_types.WOD_SUPPRESS_OPEN
15 14
WOD_CURRENT_TAB = cef_types.WOD_CURRENT_TAB
16 15
WOD_SINGLETON_TAB = cef_types.WOD_SINGLETON_TAB
17 16
WOD_NEW_FOREGROUND_TAB = cef_types.WOD_NEW_FOREGROUND_TAB
@@ -138,24 +138,27 @@ cdef public void RequestHandler_OnResourceRedirect(
138 138
CefRefPtr[CefFrame] cefFrame,
139 139
const CefString& cefOldUrl,
140 140
CefString& cefNewUrl,
141 -
CefRefPtr[CefRequest] cefRequest
141 +
CefRefPtr[CefRequest] cefRequest,
142 +
CefRefPtr[CefResponse] cefResponse
142 143
) except * with gil:
143 144
cdef PyBrowser pyBrowser
144 145
cdef PyFrame pyFrame
145 146
cdef str pyOldUrl
146 147
cdef list pyNewUrlOut
147 148
cdef PyRequest pyRequest
149 +
cdef PyResponse pyResponse
148 150
cdef object clientCallback
149 151
try:
150 152
pyBrowser = GetPyBrowser(cefBrowser)
151 153
pyFrame = GetPyFrame(cefFrame)
152 154
pyOldUrl = CefToPyString(cefOldUrl)
153 155
pyNewUrlOut = [CefToPyString(cefNewUrl)]
154 156
pyRequest = CreatePyRequest(cefRequest)
157 +
pyResponse = CreatePyResponse(cefResponse)
155 158
clientCallback = pyBrowser.GetClientCallback("OnResourceRedirect")
156 159
if clientCallback:
157 160
clientCallback(pyBrowser, pyFrame, pyOldUrl, pyNewUrlOut,
158 -
pyRequest)
161 +
pyRequest, pyResponse)
159 162
if pyNewUrlOut[0]:
160 163
PyToCefString(pyNewUrlOut[0], cefNewUrl)
161 164
except:
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4