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:
@ -14,6 +14,8 @@
|
||||
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
// MEMBER FUNCTIONS - Body may be edited by hand.
|
||||
|
||||
int CEF_CALLBACK keyboard_handler_on_pre_key_event(
|
||||
@ -93,14 +95,21 @@ int CEF_CALLBACK keyboard_handler_on_key_event(
|
||||
return _retval;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
// CONSTRUCTOR - Do not edit by hand.
|
||||
|
||||
CefKeyboardHandlerCppToC::CefKeyboardHandlerCppToC(CefKeyboardHandler* cls)
|
||||
: CefCppToC<CefKeyboardHandlerCppToC, CefKeyboardHandler,
|
||||
cef_keyboard_handler_t>(cls) {
|
||||
struct_.struct_.on_pre_key_event = keyboard_handler_on_pre_key_event;
|
||||
struct_.struct_.on_key_event = keyboard_handler_on_key_event;
|
||||
CefKeyboardHandlerCppToC::CefKeyboardHandlerCppToC() {
|
||||
GetStruct()->on_pre_key_event = keyboard_handler_on_pre_key_event;
|
||||
GetStruct()->on_key_event = keyboard_handler_on_key_event;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefKeyboardHandler> CefCppToC<CefKeyboardHandlerCppToC,
|
||||
CefKeyboardHandler, cef_keyboard_handler_t>::UnwrapDerived(
|
||||
CefWrapperType type, cef_keyboard_handler_t* s) {
|
||||
NOTREACHED() << "Unexpected class type: " << type;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
@ -108,3 +117,6 @@ template<> base::AtomicRefCount CefCppToC<CefKeyboardHandlerCppToC,
|
||||
CefKeyboardHandler, cef_keyboard_handler_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefKeyboardHandlerCppToC,
|
||||
CefKeyboardHandler, cef_keyboard_handler_t>::kWrapperType =
|
||||
WT_KEYBOARD_HANDLER;
|
||||
|
Reference in New Issue
Block a user