mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-12 01:50:37 +01:00
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
212 lines
6.3 KiB
C++
212 lines
6.3 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/client_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
|
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
int CEF_CALLBACK life_span_handler_on_before_popup(
|
|
struct _cef_life_span_handler_t* self, cef_browser_t* browser,
|
|
cef_frame_t* frame, const cef_string_t* target_url,
|
|
const cef_string_t* target_frame_name,
|
|
const struct _cef_popup_features_t* popupFeatures,
|
|
cef_window_info_t* windowInfo, cef_client_t** client,
|
|
struct _cef_browser_settings_t* settings, int* no_javascript_access) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return 0;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame);
|
|
if (!frame)
|
|
return 0;
|
|
// Verify param: popupFeatures; type: struct_byref_const
|
|
DCHECK(popupFeatures);
|
|
if (!popupFeatures)
|
|
return 0;
|
|
// Verify param: windowInfo; type: struct_byref
|
|
DCHECK(windowInfo);
|
|
if (!windowInfo)
|
|
return 0;
|
|
// Verify param: client; type: refptr_same_byref
|
|
DCHECK(client);
|
|
if (!client)
|
|
return 0;
|
|
// Verify param: settings; type: struct_byref
|
|
DCHECK(settings);
|
|
if (!settings)
|
|
return 0;
|
|
// Verify param: no_javascript_access; type: bool_byaddr
|
|
DCHECK(no_javascript_access);
|
|
if (!no_javascript_access)
|
|
return 0;
|
|
// Unverified params: target_url, target_frame_name
|
|
|
|
// Translate param: popupFeatures; type: struct_byref_const
|
|
CefPopupFeatures popupFeaturesObj;
|
|
if (popupFeatures)
|
|
popupFeaturesObj.Set(*popupFeatures, false);
|
|
// Translate param: windowInfo; type: struct_byref
|
|
CefWindowInfo windowInfoObj;
|
|
if (windowInfo)
|
|
windowInfoObj.AttachTo(*windowInfo);
|
|
// Translate param: client; type: refptr_same_byref
|
|
CefRefPtr<CefClient> clientPtr;
|
|
if (client && *client)
|
|
clientPtr = CefClientCppToC::Unwrap(*client);
|
|
CefClient* clientOrig = clientPtr.get();
|
|
// Translate param: settings; type: struct_byref
|
|
CefBrowserSettings settingsObj;
|
|
if (settings)
|
|
settingsObj.AttachTo(*settings);
|
|
// Translate param: no_javascript_access; type: bool_byaddr
|
|
bool no_javascript_accessBool = (
|
|
no_javascript_access && *no_javascript_access)?true:false;
|
|
|
|
// Execute
|
|
bool _retval = CefLifeSpanHandlerCppToC::Get(self)->OnBeforePopup(
|
|
CefBrowserCToCpp::Wrap(browser),
|
|
CefFrameCToCpp::Wrap(frame),
|
|
CefString(target_url),
|
|
CefString(target_frame_name),
|
|
popupFeaturesObj,
|
|
windowInfoObj,
|
|
clientPtr,
|
|
settingsObj,
|
|
&no_javascript_accessBool);
|
|
|
|
// Restore param: windowInfo; type: struct_byref
|
|
if (windowInfo)
|
|
windowInfoObj.DetachTo(*windowInfo);
|
|
// Restore param: client; type: refptr_same_byref
|
|
if (client) {
|
|
if (clientPtr.get()) {
|
|
if (clientPtr.get() != clientOrig) {
|
|
*client = CefClientCppToC::Wrap(clientPtr);
|
|
}
|
|
} else {
|
|
*client = NULL;
|
|
}
|
|
}
|
|
// Restore param: settings; type: struct_byref
|
|
if (settings)
|
|
settingsObj.DetachTo(*settings);
|
|
// Restore param: no_javascript_access; type: bool_byaddr
|
|
if (no_javascript_access)
|
|
*no_javascript_access = no_javascript_accessBool?true:false;
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
void CEF_CALLBACK life_span_handler_on_after_created(
|
|
struct _cef_life_span_handler_t* self, cef_browser_t* browser) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return;
|
|
|
|
// Execute
|
|
CefLifeSpanHandlerCppToC::Get(self)->OnAfterCreated(
|
|
CefBrowserCToCpp::Wrap(browser));
|
|
}
|
|
|
|
int CEF_CALLBACK life_span_handler_run_modal(
|
|
struct _cef_life_span_handler_t* self, cef_browser_t* browser) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return 0;
|
|
|
|
// Execute
|
|
bool _retval = CefLifeSpanHandlerCppToC::Get(self)->RunModal(
|
|
CefBrowserCToCpp::Wrap(browser));
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
int CEF_CALLBACK life_span_handler_do_close(
|
|
struct _cef_life_span_handler_t* self, cef_browser_t* browser) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return 0;
|
|
|
|
// Execute
|
|
bool _retval = CefLifeSpanHandlerCppToC::Get(self)->DoClose(
|
|
CefBrowserCToCpp::Wrap(browser));
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
void CEF_CALLBACK life_span_handler_on_before_close(
|
|
struct _cef_life_span_handler_t* self, cef_browser_t* browser) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return;
|
|
|
|
// Execute
|
|
CefLifeSpanHandlerCppToC::Get(self)->OnBeforeClose(
|
|
CefBrowserCToCpp::Wrap(browser));
|
|
}
|
|
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefLifeSpanHandlerCppToC::CefLifeSpanHandlerCppToC(CefLifeSpanHandler* cls)
|
|
: CefCppToC<CefLifeSpanHandlerCppToC, CefLifeSpanHandler,
|
|
cef_life_span_handler_t>(cls) {
|
|
struct_.struct_.on_before_popup = life_span_handler_on_before_popup;
|
|
struct_.struct_.on_after_created = life_span_handler_on_after_created;
|
|
struct_.struct_.run_modal = life_span_handler_run_modal;
|
|
struct_.struct_.do_close = life_span_handler_do_close;
|
|
struct_.struct_.on_before_close = life_span_handler_on_before_close;
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCppToC<CefLifeSpanHandlerCppToC,
|
|
CefLifeSpanHandler, cef_life_span_handler_t>::DebugObjCt = 0;
|
|
#endif
|
|
|