mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-16 19:39:18 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
236 lines
7.1 KiB
C++
236 lines
7.1 KiB
C++
// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
//
|
|
// ---------------------------------------------------------------------------
|
|
//
|
|
// This file was generated by the CEF translator tool. If making changes by
|
|
// hand only do so within the body of existing method and function
|
|
// implementations. See the translator.README.txt file in the tools directory
|
|
// for more information.
|
|
//
|
|
|
|
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/process_message_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/client_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/context_menu_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/dialog_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/display_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/download_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/drag_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/focus_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/geolocation_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/keyboard_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/load_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/render_handler_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/request_handler_ctocpp.h"
|
|
|
|
|
|
// VIRTUAL METHODS - Body may be edited by hand.
|
|
|
|
CefRefPtr<CefContextMenuHandler> CefClientCToCpp::GetContextMenuHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_context_menu_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_context_menu_handler_t* _retval = struct_->get_context_menu_handler(
|
|
struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefContextMenuHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefDialogHandler> CefClientCToCpp::GetDialogHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_dialog_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_dialog_handler_t* _retval = struct_->get_dialog_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefDialogHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefDisplayHandler> CefClientCToCpp::GetDisplayHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_display_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_display_handler_t* _retval = struct_->get_display_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefDisplayHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefDownloadHandler> CefClientCToCpp::GetDownloadHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_download_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_download_handler_t* _retval = struct_->get_download_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefDownloadHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefDragHandler> CefClientCToCpp::GetDragHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_drag_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_drag_handler_t* _retval = struct_->get_drag_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefDragHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefFocusHandler> CefClientCToCpp::GetFocusHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_focus_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_focus_handler_t* _retval = struct_->get_focus_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefFocusHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefGeolocationHandler> CefClientCToCpp::GetGeolocationHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_geolocation_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_geolocation_handler_t* _retval = struct_->get_geolocation_handler(
|
|
struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefGeolocationHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefJSDialogHandler> CefClientCToCpp::GetJSDialogHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_jsdialog_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_jsdialog_handler_t* _retval = struct_->get_jsdialog_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefJSDialogHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefKeyboardHandler> CefClientCToCpp::GetKeyboardHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_keyboard_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_keyboard_handler_t* _retval = struct_->get_keyboard_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefKeyboardHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefLifeSpanHandler> CefClientCToCpp::GetLifeSpanHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_life_span_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_life_span_handler_t* _retval = struct_->get_life_span_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefLifeSpanHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefLoadHandler> CefClientCToCpp::GetLoadHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_load_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_load_handler_t* _retval = struct_->get_load_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefLoadHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefRenderHandler> CefClientCToCpp::GetRenderHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_render_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_render_handler_t* _retval = struct_->get_render_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefRenderHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefRequestHandler> CefClientCToCpp::GetRequestHandler() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_request_handler))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_request_handler_t* _retval = struct_->get_request_handler(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefRequestHandlerCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
bool CefClientCToCpp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
|
|
CefProcessId source_process, CefRefPtr<CefProcessMessage> message) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_process_message_received))
|
|
return false;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return false;
|
|
// Verify param: message; type: refptr_diff
|
|
DCHECK(message.get());
|
|
if (!message.get())
|
|
return false;
|
|
|
|
// Execute
|
|
int _retval = struct_->on_process_message_received(struct_,
|
|
CefBrowserCppToC::Wrap(browser),
|
|
source_process,
|
|
CefProcessMessageCppToC::Wrap(message));
|
|
|
|
// Return type: bool
|
|
return _retval?true:false;
|
|
}
|
|
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCToCpp<CefClientCToCpp, CefClient,
|
|
cef_client_t>::DebugObjCt = 0;
|
|
#endif
|
|
|