mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-02 20:26:59 +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
130 lines
3.9 KiB
C++
130 lines
3.9 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/jsdialog_callback_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h"
|
|
|
|
|
|
// VIRTUAL METHODS - Body may be edited by hand.
|
|
|
|
bool CefJSDialogHandlerCToCpp::OnJSDialog(CefRefPtr<CefBrowser> browser,
|
|
const CefString& origin_url, const CefString& accept_lang,
|
|
JSDialogType dialog_type, const CefString& message_text,
|
|
const CefString& default_prompt_text,
|
|
CefRefPtr<CefJSDialogCallback> callback, bool& suppress_message) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_jsdialog))
|
|
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: callback; type: refptr_diff
|
|
DCHECK(callback.get());
|
|
if (!callback.get())
|
|
return false;
|
|
// Unverified params: origin_url, accept_lang, message_text,
|
|
// default_prompt_text
|
|
|
|
// Translate param: suppress_message; type: bool_byref
|
|
int suppress_messageInt = suppress_message;
|
|
|
|
// Execute
|
|
int _retval = struct_->on_jsdialog(struct_,
|
|
CefBrowserCppToC::Wrap(browser),
|
|
origin_url.GetStruct(),
|
|
accept_lang.GetStruct(),
|
|
dialog_type,
|
|
message_text.GetStruct(),
|
|
default_prompt_text.GetStruct(),
|
|
CefJSDialogCallbackCppToC::Wrap(callback),
|
|
&suppress_messageInt);
|
|
|
|
// Restore param:suppress_message; type: bool_byref
|
|
suppress_message = suppress_messageInt?true:false;
|
|
|
|
// Return type: bool
|
|
return _retval?true:false;
|
|
}
|
|
|
|
bool CefJSDialogHandlerCToCpp::OnBeforeUnloadDialog(
|
|
CefRefPtr<CefBrowser> browser, const CefString& message_text,
|
|
bool is_reload, CefRefPtr<CefJSDialogCallback> callback) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_before_unload_dialog))
|
|
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: callback; type: refptr_diff
|
|
DCHECK(callback.get());
|
|
if (!callback.get())
|
|
return false;
|
|
// Unverified params: message_text
|
|
|
|
// Execute
|
|
int _retval = struct_->on_before_unload_dialog(struct_,
|
|
CefBrowserCppToC::Wrap(browser),
|
|
message_text.GetStruct(),
|
|
is_reload,
|
|
CefJSDialogCallbackCppToC::Wrap(callback));
|
|
|
|
// Return type: bool
|
|
return _retval?true:false;
|
|
}
|
|
|
|
void CefJSDialogHandlerCToCpp::OnResetDialogState(
|
|
CefRefPtr<CefBrowser> browser) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_reset_dialog_state))
|
|
return;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return;
|
|
|
|
// Execute
|
|
struct_->on_reset_dialog_state(struct_,
|
|
CefBrowserCppToC::Wrap(browser));
|
|
}
|
|
|
|
void CefJSDialogHandlerCToCpp::OnDialogClosed(CefRefPtr<CefBrowser> browser) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_dialog_closed))
|
|
return;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return;
|
|
|
|
// Execute
|
|
struct_->on_dialog_closed(struct_,
|
|
CefBrowserCppToC::Wrap(browser));
|
|
}
|
|
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCToCpp<CefJSDialogHandlerCToCpp,
|
|
CefJSDialogHandler, cef_jsdialog_handler_t>::DebugObjCt = 0;
|
|
#endif
|
|
|