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.
|
||||
|
||||
void CEF_CALLBACK focus_handler_on_take_focus(struct _cef_focus_handler_t* self,
|
||||
@ -72,15 +74,22 @@ void CEF_CALLBACK focus_handler_on_got_focus(struct _cef_focus_handler_t* self,
|
||||
CefBrowserCToCpp::Wrap(browser));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
// CONSTRUCTOR - Do not edit by hand.
|
||||
|
||||
CefFocusHandlerCppToC::CefFocusHandlerCppToC(CefFocusHandler* cls)
|
||||
: CefCppToC<CefFocusHandlerCppToC, CefFocusHandler, cef_focus_handler_t>(
|
||||
cls) {
|
||||
struct_.struct_.on_take_focus = focus_handler_on_take_focus;
|
||||
struct_.struct_.on_set_focus = focus_handler_on_set_focus;
|
||||
struct_.struct_.on_got_focus = focus_handler_on_got_focus;
|
||||
CefFocusHandlerCppToC::CefFocusHandlerCppToC() {
|
||||
GetStruct()->on_take_focus = focus_handler_on_take_focus;
|
||||
GetStruct()->on_set_focus = focus_handler_on_set_focus;
|
||||
GetStruct()->on_got_focus = focus_handler_on_got_focus;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefFocusHandler> CefCppToC<CefFocusHandlerCppToC,
|
||||
CefFocusHandler, cef_focus_handler_t>::UnwrapDerived(CefWrapperType type,
|
||||
cef_focus_handler_t* s) {
|
||||
NOTREACHED() << "Unexpected class type: " << type;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
@ -88,3 +97,5 @@ template<> base::AtomicRefCount CefCppToC<CefFocusHandlerCppToC,
|
||||
CefFocusHandler, cef_focus_handler_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefFocusHandlerCppToC, CefFocusHandler,
|
||||
cef_focus_handler_t>::kWrapperType = WT_FOCUS_HANDLER;
|
||||
|
Reference in New Issue
Block a user