Skip to content

Commit 33af18e

Browse files
CzarekCzarek
Czarek
authored and
Czarek
committed
Merge branch 'HEAD' of https://code.google.com/p/cefpython/
Conflicts: cefpython/cef1/linux/binaries_64bit/wxpython.py cefpython/cefpython.pyx
2 parents cc828fc + 5e432f4 commit 33af18e

249 files changed

Lines changed: 1722 additions & 499 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cefpython/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ cefpython_py27.pyd
3636
cefpython_py32.pyd
3737
cefpython_py27.so
3838
cefpython_py32.so
39+
40+
cython_includes/compile_time_constants.pxi

‎cefpython/cef1/BUILD_COMPATIBILITY.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Chromium/CEF branch:
22
1453
33
Chromium release url:
4-
http://src.chromium.org/svn/releases/27.0.1453.93
4+
http://src.chromium.org/svn/releases/27.0.1453.110
55
CEF revision:
6-
1268
6+
1273
77
CEF repository url:
8-
http://chromiumembedded.googlecode.com/svn/branches/1453/cef1@1268
8+
http://chromiumembedded.googlecode.com/svn/branches/1453/cef1@1273

‎cefpython/cef1/client_handler/client_handler.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#pragma once
66

7+
#if defined(_WIN32)
8+
#include "../windows/stdint.h"
9+
#endif
10+
711
#include "cefpython_public_api.h"
812

913
class ClientHandler : public CefClient,

‎cefpython/cef1/client_handler/client_handler_py27.vcproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,22 @@
150150
RelativePath=".\client_handler.h"
151151
>
152152
</File>
153+
<File
154+
RelativePath=".\content_filter_handler.h"
155+
>
156+
</File>
157+
<File
158+
RelativePath=".\cookie_visitor.h"
159+
>
160+
</File>
161+
<File
162+
RelativePath=".\download_handler.h"
163+
>
164+
</File>
165+
<File
166+
RelativePath=".\web_request_client.h"
167+
>
168+
</File>
153169
</Filter>
154170
<Filter
155171
Name="Resource Files"
@@ -166,6 +182,22 @@
166182
RelativePath=".\client_handler.cpp"
167183
>
168184
</File>
185+
<File
186+
RelativePath=".\content_filter_handler.cpp"
187+
>
188+
</File>
189+
<File
190+
RelativePath=".\cookie_visitor.cpp"
191+
>
192+
</File>
193+
<File
194+
RelativePath=".\download_handler.cpp"
195+
>
196+
</File>
197+
<File
198+
RelativePath=".\web_request_client.cpp"
199+
>
200+
</File>
169201
</Filter>
170202
</Files>
171203
<Globals>

‎cefpython/cef1/client_handler/client_handler_py32.vcproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,22 @@
149149
RelativePath=".\client_handler.h"
150150
>
151151
</File>
152+
<File
153+
RelativePath=".\content_filter_handler.h"
154+
>
155+
</File>
156+
<File
157+
RelativePath=".\cookie_visitor.h"
158+
>
159+
</File>
160+
<File
161+
RelativePath=".\download_handler.h"
162+
>
163+
</File>
164+
<File
165+
RelativePath=".\web_request_client.h"
166+
>
167+
</File>
152168
</Filter>
153169
<Filter
154170
Name="Resource Files"
@@ -165,6 +181,22 @@
165181
RelativePath=".\client_handler.cpp"
166182
>
167183
</File>
184+
<File
185+
RelativePath=".\content_filter_handler.cpp"
186+
>
187+
</File>
188+
<File
189+
RelativePath=".\cookie_visitor.cpp"
190+
>
191+
</File>
192+
<File
193+
RelativePath=".\download_handler.cpp"
194+
>
195+
</File>
196+
<File
197+
RelativePath=".\web_request_client.cpp"
198+
>
199+
</File>
168200
</Filter>
169201
</Files>
170202
<Globals>

‎cefpython/cef1/client_handler/content_filter_handler.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#pragma once
66

7+
#if defined(_WIN32)
8+
#include "../windows/stdint.h"
9+
#endif
10+
711
#include "cefpython_public_api.h"
812

913
class ContentFilterHandler : public CefContentFilter

‎cefpython/cef1/client_handler/cookie_visitor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ bool CookieVisitor::Visit(
1212
bool& deleteCookie
1313
) {
1414
REQUIRE_IO_THREAD();
15-
CookieVisitor_Visit(cookieVisitorId_, cookie, count, total, deleteCookie);
15+
return CookieVisitor_Visit(cookieVisitorId_, cookie, count, total, deleteCookie);
1616
}

‎cefpython/cef1/client_handler/cookie_visitor.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#pragma once
66

7+
#if defined(_WIN32)
8+
#include "../windows/stdint.h"
9+
#endif
10+
711
#include "cefpython_public_api.h"
812

913
class CookieVisitor : public CefCookieVisitor

‎cefpython/cef1/client_handler/download_handler.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#pragma once
66

7+
#if defined(_WIN32)
8+
#include "../windows/stdint.h"
9+
#endif
10+
711
#include "cefpython_public_api.h"
812

913
class DownloadHandler : public CefDownloadHandler

‎cefpython/cef1/client_handler/web_request_client.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#pragma once
66

7+
#if defined(_WIN32)
8+
#include "../windows/stdint.h"
9+
#endif
10+
711
#include "cefpython_public_api.h"
812

913
class WebRequestClient : public CefWebURLRequestClient

0 commit comments

Comments
 (0)