mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Improve inheritance support in the CEF API (issue #1623).
- Support single parent inheritance in CEF API classes. - Support non-virtual inheritance in CEF API classes. - Support translation of CEF API sub-directories. - Add test sub-directories for testing-only functionality that will be available to unit tests but not exposed via the binary distribution. - Add unit tests for the translator tool. - Fix parsing of template parameter types that include commas.
This commit is contained in:
@ -13,6 +13,8 @@
|
||||
#include "libcef_dll/cpptoc/read_handler_cpptoc.h"
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
// MEMBER FUNCTIONS - Body may be edited by hand.
|
||||
|
||||
size_t CEF_CALLBACK read_handler_read(struct _cef_read_handler_t* self,
|
||||
@ -96,16 +98,24 @@ int CEF_CALLBACK read_handler_may_block(struct _cef_read_handler_t* self) {
|
||||
return _retval;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
// CONSTRUCTOR - Do not edit by hand.
|
||||
|
||||
CefReadHandlerCppToC::CefReadHandlerCppToC(CefReadHandler* cls)
|
||||
: CefCppToC<CefReadHandlerCppToC, CefReadHandler, cef_read_handler_t>(cls) {
|
||||
struct_.struct_.read = read_handler_read;
|
||||
struct_.struct_.seek = read_handler_seek;
|
||||
struct_.struct_.tell = read_handler_tell;
|
||||
struct_.struct_.eof = read_handler_eof;
|
||||
struct_.struct_.may_block = read_handler_may_block;
|
||||
CefReadHandlerCppToC::CefReadHandlerCppToC() {
|
||||
GetStruct()->read = read_handler_read;
|
||||
GetStruct()->seek = read_handler_seek;
|
||||
GetStruct()->tell = read_handler_tell;
|
||||
GetStruct()->eof = read_handler_eof;
|
||||
GetStruct()->may_block = read_handler_may_block;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefReadHandler> CefCppToC<CefReadHandlerCppToC,
|
||||
CefReadHandler, cef_read_handler_t>::UnwrapDerived(CefWrapperType type,
|
||||
cef_read_handler_t* s) {
|
||||
NOTREACHED() << "Unexpected class type: " << type;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
@ -113,3 +123,5 @@ template<> base::AtomicRefCount CefCppToC<CefReadHandlerCppToC, CefReadHandler,
|
||||
cef_read_handler_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefReadHandlerCppToC, CefReadHandler,
|
||||
cef_read_handler_t>::kWrapperType = WT_READ_HANDLER;
|
||||
|
Reference in New Issue
Block a user