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:
@ -15,6 +15,8 @@
|
||||
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
// MEMBER FUNCTIONS - Body may be edited by hand.
|
||||
|
||||
void CEF_CALLBACK load_handler_on_loading_state_change(
|
||||
@ -114,16 +116,23 @@ void CEF_CALLBACK load_handler_on_load_error(struct _cef_load_handler_t* self,
|
||||
CefString(failedUrl));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
// CONSTRUCTOR - Do not edit by hand.
|
||||
|
||||
CefLoadHandlerCppToC::CefLoadHandlerCppToC(CefLoadHandler* cls)
|
||||
: CefCppToC<CefLoadHandlerCppToC, CefLoadHandler, cef_load_handler_t>(cls) {
|
||||
struct_.struct_.on_loading_state_change =
|
||||
load_handler_on_loading_state_change;
|
||||
struct_.struct_.on_load_start = load_handler_on_load_start;
|
||||
struct_.struct_.on_load_end = load_handler_on_load_end;
|
||||
struct_.struct_.on_load_error = load_handler_on_load_error;
|
||||
CefLoadHandlerCppToC::CefLoadHandlerCppToC() {
|
||||
GetStruct()->on_loading_state_change = load_handler_on_loading_state_change;
|
||||
GetStruct()->on_load_start = load_handler_on_load_start;
|
||||
GetStruct()->on_load_end = load_handler_on_load_end;
|
||||
GetStruct()->on_load_error = load_handler_on_load_error;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefLoadHandler> CefCppToC<CefLoadHandlerCppToC,
|
||||
CefLoadHandler, cef_load_handler_t>::UnwrapDerived(CefWrapperType type,
|
||||
cef_load_handler_t* s) {
|
||||
NOTREACHED() << "Unexpected class type: " << type;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
@ -131,3 +140,5 @@ template<> base::AtomicRefCount CefCppToC<CefLoadHandlerCppToC, CefLoadHandler,
|
||||
cef_load_handler_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefLoadHandlerCppToC, CefLoadHandler,
|
||||
cef_load_handler_t>::kWrapperType = WT_LOAD_HANDLER;
|
||||
|
Reference in New Issue
Block a user