mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-23 16:01:08 +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
117 lines
3.5 KiB
C++
117 lines
3.5 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/context_menu_params_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/frame_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/menu_model_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/context_menu_handler_ctocpp.h"
|
|
|
|
|
|
// VIRTUAL METHODS - Body may be edited by hand.
|
|
|
|
void CefContextMenuHandlerCToCpp::OnBeforeContextMenu(
|
|
CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefMenuModel> model) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_before_context_menu))
|
|
return;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame.get());
|
|
if (!frame.get())
|
|
return;
|
|
// Verify param: params; type: refptr_diff
|
|
DCHECK(params.get());
|
|
if (!params.get())
|
|
return;
|
|
// Verify param: model; type: refptr_diff
|
|
DCHECK(model.get());
|
|
if (!model.get())
|
|
return;
|
|
|
|
// Execute
|
|
struct_->on_before_context_menu(struct_,
|
|
CefBrowserCppToC::Wrap(browser),
|
|
CefFrameCppToC::Wrap(frame),
|
|
CefContextMenuParamsCppToC::Wrap(params),
|
|
CefMenuModelCppToC::Wrap(model));
|
|
}
|
|
|
|
bool CefContextMenuHandlerCToCpp::OnContextMenuCommand(
|
|
CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefContextMenuParams> params, int command_id,
|
|
EventFlags event_flags) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_context_menu_command))
|
|
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: frame; type: refptr_diff
|
|
DCHECK(frame.get());
|
|
if (!frame.get())
|
|
return false;
|
|
// Verify param: params; type: refptr_diff
|
|
DCHECK(params.get());
|
|
if (!params.get())
|
|
return false;
|
|
|
|
// Execute
|
|
int _retval = struct_->on_context_menu_command(struct_,
|
|
CefBrowserCppToC::Wrap(browser),
|
|
CefFrameCppToC::Wrap(frame),
|
|
CefContextMenuParamsCppToC::Wrap(params),
|
|
command_id,
|
|
event_flags);
|
|
|
|
// Return type: bool
|
|
return _retval?true:false;
|
|
}
|
|
|
|
void CefContextMenuHandlerCToCpp::OnContextMenuDismissed(
|
|
CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame) {
|
|
if (CEF_MEMBER_MISSING(struct_, on_context_menu_dismissed))
|
|
return;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame.get());
|
|
if (!frame.get())
|
|
return;
|
|
|
|
// Execute
|
|
struct_->on_context_menu_dismissed(struct_,
|
|
CefBrowserCppToC::Wrap(browser),
|
|
CefFrameCppToC::Wrap(frame));
|
|
}
|
|
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCToCpp<CefContextMenuHandlerCToCpp,
|
|
CefContextMenuHandler, cef_context_menu_handler_t>::DebugObjCt = 0;
|
|
#endif
|
|
|