Updated CEF 1 on Windows to branch 1453, CEF rev. 1268, Chrome

cztomczak · cztomczak · commit 9c8b1a42ec56 · 2013-06-04T20:36:31.000+02:00
version 27.0.1453.93.

Completed instructions for building on Windows, see the
BuildOnWindows wiki page.

Fixed compilation error in render handler.

Fixed compilation error on windows, adding the missing
stdint.h file.

Fixes to the Visual C++ projects, stdint.h include missing,
OS_WIN macro missing.

Updated client_handler C++ project to include new handlers
implemented in v55.

Fixed CookieVisitor::Visit(), there was no return value
(strange that Linux compiler didn't detect this, bug found
on Windows using Visual Studio).
diff --git a/cefpython/cef1/client_handler/client_handler.h b/cefpython/cef1/client_handler/client_handler.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#if defined(_WIN32)
+#include "../windows/stdint.h"
+#endif
+
 #include "cefpython_public_api.h"
 
 class ClientHandler : public CefClient,
diff --git a/cefpython/cef1/client_handler/client_handler_py27.vcproj b/cefpython/cef1/client_handler/client_handler_py27.vcproj
@@ -150,6 +150,22 @@
 				RelativePath=".\client_handler.h"
 				>
 			</File>
+			<File
+				RelativePath=".\content_filter_handler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\cookie_visitor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download_handler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\web_request_client.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -166,6 +182,22 @@
 				RelativePath=".\client_handler.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\content_filter_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cookie_visitor.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\download_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\web_request_client.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/cefpython/cef1/client_handler/client_handler_py32.vcproj b/cefpython/cef1/client_handler/client_handler_py32.vcproj
@@ -149,6 +149,22 @@
 				RelativePath=".\client_handler.h"
 				>
 			</File>
+			<File
+				RelativePath=".\content_filter_handler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\cookie_visitor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download_handler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\web_request_client.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -165,6 +181,22 @@
 				RelativePath=".\client_handler.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\content_filter_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cookie_visitor.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\download_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\web_request_client.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/cefpython/cef1/client_handler/content_filter_handler.h b/cefpython/cef1/client_handler/content_filter_handler.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#if defined(_WIN32)
+#include "../windows/stdint.h"
+#endif
+
 #include "cefpython_public_api.h"
 
 class ContentFilterHandler : public CefContentFilter
diff --git a/cefpython/cef1/client_handler/cookie_visitor.cpp b/cefpython/cef1/client_handler/cookie_visitor.cpp
@@ -12,5 +12,5 @@ bool CookieVisitor::Visit(
         bool& deleteCookie
         ) {
     REQUIRE_IO_THREAD();
-    CookieVisitor_Visit(cookieVisitorId_, cookie, count, total, deleteCookie);
+    return CookieVisitor_Visit(cookieVisitorId_, cookie, count, total, deleteCookie);
 }
diff --git a/cefpython/cef1/client_handler/cookie_visitor.h b/cefpython/cef1/client_handler/cookie_visitor.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#if defined(_WIN32)
+#include "../windows/stdint.h"
+#endif
+
 #include "cefpython_public_api.h"
 
 class CookieVisitor : public CefCookieVisitor
diff --git a/cefpython/cef1/client_handler/download_handler.h b/cefpython/cef1/client_handler/download_handler.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#if defined(_WIN32)
+#include "../windows/stdint.h"
+#endif
+
 #include "cefpython_public_api.h"
 
 class DownloadHandler : public CefDownloadHandler
diff --git a/cefpython/cef1/client_handler/web_request_client.h b/cefpython/cef1/client_handler/web_request_client.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#if defined(_WIN32)
+#include "../windows/stdint.h"
+#endif
+
 #include "cefpython_public_api.h"
 
 class WebRequestClient : public CefWebURLRequestClient
diff --git a/cefpython/cef1/v8function_handler/v8function_handler.h b/cefpython/cef1/v8function_handler/v8function_handler.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "../windows/stdint.h"
 #include "cefpython_public_api.h"
 
 typedef void (*RemovePythonCallback_type)(
diff --git a/cefpython/cef1/windows/.gitignore b/cefpython/cef1/windows/.gitignore
@@ -7,3 +7,4 @@
 *.dll
 
 *.lib
+*.pyd
diff --git a/cefpython/cef1/windows/setup/cefpython.h b/cefpython/cef1/windows/setup/cefpython.h
@@ -1,8 +1,8 @@
-#ifndef __PYX_HAVE__cefpython_py32
-#define __PYX_HAVE__cefpython_py32
+#ifndef __PYX_HAVE__cefpython_py27
+#define __PYX_HAVE__cefpython_py27
 
 
-#ifndef __PYX_HAVE_API__cefpython_py32
+#ifndef __PYX_HAVE_API__cefpython_py27
 
 #ifndef __PYX_EXTERN_C
   #ifdef __cplusplus
@@ -12,16 +12,25 @@
   #endif
 #endif
 
+__PYX_EXTERN_C DL_IMPORT(bool) CookieVisitor_Visit(int, CefCookie const &, int, int, bool &);
 __PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadEnd(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, int);
 __PYX_EXTERN_C DL_IMPORT(void) LoadHandler_OnLoadStart(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>);
 __PYX_EXTERN_C DL_IMPORT(bool) LoadHandler_OnLoadError(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, enum cef_handler_errorcode_t, CefString &, CefString &);
 __PYX_EXTERN_C DL_IMPORT(bool) KeyboardHandler_OnKeyEvent(CefRefPtr<CefBrowser>, enum cef_handler_keyevent_type_t, int, int, bool, bool);
+__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnStateChange(int, CefRefPtr<CefWebURLRequest>, enum cef_weburlrequest_state_t);
+__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnRedirect(int, CefRefPtr<CefWebURLRequest>, CefRefPtr<CefRequest>, CefRefPtr<CefResponse>);
+__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnHeadersReceived(int, CefRefPtr<CefWebURLRequest>, CefRefPtr<CefResponse>);
+__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnProgress(int, CefRefPtr<CefWebURLRequest>, uint64_t, uint64_t);
+__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnData(int, CefRefPtr<CefWebURLRequest>, void *, int);
+__PYX_EXTERN_C DL_IMPORT(void) WebRequestClient_OnError(int, CefRefPtr<CefWebURLRequest>, int);
+__PYX_EXTERN_C DL_IMPORT(void) ContentFilterHandler_ProcessData(int, void const *, int, CefRefPtr<CefStreamReader> &);
+__PYX_EXTERN_C DL_IMPORT(void) ContentFilterHandler_Drain(int, CefRefPtr<CefStreamReader> &);
 __PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforeBrowse(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefRequest>, enum cef_handler_navtype_t, bool);
 __PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnBeforeResourceLoad(CefRefPtr<CefBrowser>, CefRefPtr<CefRequest>, CefString &, CefRefPtr<CefStreamReader> &, CefRefPtr<CefResponse>, int);
 __PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnResourceRedirect(CefRefPtr<CefBrowser>, CefString &, CefString &);
 __PYX_EXTERN_C DL_IMPORT(void) RequestHandler_OnResourceResponse(CefRefPtr<CefBrowser>, CefString &, CefRefPtr<CefResponse>, CefRefPtr<CefContentFilter> &);
 __PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_OnProtocolExecution(CefRefPtr<CefBrowser>, CefString &, bool &);
-__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_GetDownloadHandler(CefRefPtr<CefBrowser>, CefString &, CefString &, int64, CefRefPtr<CefDownloadHandler> &);
+__PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_GetDownloadHandler(CefRefPtr<CefBrowser>, CefString const &, CefString const &, int64, CefRefPtr<CefDownloadHandler> &);
 __PYX_EXTERN_C DL_IMPORT(bool) RequestHandler_GetAuthCredentials(CefRefPtr<CefBrowser>, bool, CefString &, int, CefString &, CefString &, CefString &, CefString &);
 __PYX_EXTERN_C DL_IMPORT(CefRefPtr<CefCookieManager>) RequestHandler_GetCookieManager(CefRefPtr<CefBrowser>, CefString &);
 __PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnAddressChange(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString &);
@@ -42,17 +51,21 @@ __PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPopupShow(CefRefPtr<CefBrowser>,
 __PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPopupSize(CefRefPtr<CefBrowser>, CefRect &);
 __PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnPaint(CefRefPtr<CefBrowser>, cef_paint_element_type_t, std::vector<CefRect> &, void *);
 __PYX_EXTERN_C DL_IMPORT(void) RenderHandler_OnCursorChange(CefRefPtr<CefBrowser>, CefCursorHandle);
+__PYX_EXTERN_C DL_IMPORT(bool) DragHandler_OnDragStart(CefRefPtr<CefBrowser>, CefRefPtr<CefDragData>, enum cef_drag_operations_mask_t);
+__PYX_EXTERN_C DL_IMPORT(bool) DragHandler_OnDragEnter(CefRefPtr<CefBrowser>, CefRefPtr<CefDragData>, enum cef_drag_operations_mask_t);
+__PYX_EXTERN_C DL_IMPORT(bool) DownloadHandler_ReceivedData(int, void *, int);
+__PYX_EXTERN_C DL_IMPORT(void) DownloadHandler_Complete(int);
 __PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefV8Context>);
 __PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextReleased(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefV8Context>);
 __PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnUncaughtException(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefV8Context>, CefRefPtr<CefV8Exception>, CefRefPtr<CefV8StackTrace>);
 __PYX_EXTERN_C DL_IMPORT(bool) V8FunctionHandler_Execute(CefRefPtr<CefV8Context>, int, CefString &, CefRefPtr<CefV8Value>, CefV8ValueList &, CefRefPtr<CefV8Value> &, CefString &);
 
-#endif /* !__PYX_HAVE_API__cefpython_py32 */
+#endif /* !__PYX_HAVE_API__cefpython_py27 */
 
 #if PY_MAJOR_VERSION < 3
-PyMODINIT_FUNC initcefpython_py32(void);
+PyMODINIT_FUNC initcefpython_py27(void);
 #else
-PyMODINIT_FUNC PyInit_cefpython_py32(void);
+PyMODINIT_FUNC PyInit_cefpython_py27(void);
 #endif
 
-#endif /* !__PYX_HAVE__cefpython_py32 */
+#endif /* !__PYX_HAVE__cefpython_py27 */
diff --git a/cefpython/cef1/windows/setup/setup.py b/cefpython/cef1/windows/setup/setup.py
@@ -58,12 +58,18 @@ def CompileTimeConstants():
     ["cefpython.pyx"],
 
     cython_directives={
-        "c_string_type": C_STRING_TYPE, 
+        "c_string_type": C_STRING_TYPE,
         "c_string_encoding": C_STRING_ENCODING,
     },
 
     language='c++',
-    include_dirs=[r'./../', r'./../../', r'./../../../', r'./../../../cython_includes/'],
+
+    include_dirs=[
+        r'./../',
+        r'./../../',
+        r'./../../../',
+        r'./../../../cython_includes/',
+    ],
 
     library_dirs=[
         r'./',
@@ -102,4 +108,4 @@ def CompileTimeConstants():
     name = 'cefpython_py%s' % PYTHON_VERSION,
     cmdclass = {'build_ext': build_ext},
     ext_modules = ext_modules
-)
+)
diff --git a/cefpython/cef1/windows/stdint.h b/cefpython/cef1/windows/stdint.h
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
diff --git a/cefpython/cpp_utils/PaintBuffer.h b/cefpython/cpp_utils/PaintBuffer.h
diff --git a/cefpython/render_handler.pyx b/cefpython/render_handler.pyx

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ bool CookieVisitor::Visit(`
`12`	`12`	`bool& deleteCookie`
`13`	`13`	`) {`
`14`	`14`	`REQUIRE_IO_THREAD();`
`15`		`- CookieVisitor_Visit(cookieVisitorId_, cookie, count, total, deleteCookie);`
	`15`	`+ return CookieVisitor_Visit(cookieVisitorId_, cookie, count, total, deleteCookie);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,4 @@`
`7`	`7`	`*.dll`
`8`	`8`
`9`	`9`	`*.lib`
	`10`	`+*.pyd`