mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-12 01:50:37 +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
133 lines
4.0 KiB
C++
133 lines
4.0 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/context_menu_handler_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/context_menu_params_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/menu_model_ctocpp.h"
|
|
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
void CEF_CALLBACK context_menu_handler_on_before_context_menu(
|
|
struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
|
|
struct _cef_frame_t* frame, struct _cef_context_menu_params_t* params,
|
|
struct _cef_menu_model_t* model) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame);
|
|
if (!frame)
|
|
return;
|
|
// Verify param: params; type: refptr_diff
|
|
DCHECK(params);
|
|
if (!params)
|
|
return;
|
|
// Verify param: model; type: refptr_diff
|
|
DCHECK(model);
|
|
if (!model)
|
|
return;
|
|
|
|
// Execute
|
|
CefContextMenuHandlerCppToC::Get(self)->OnBeforeContextMenu(
|
|
CefBrowserCToCpp::Wrap(browser),
|
|
CefFrameCToCpp::Wrap(frame),
|
|
CefContextMenuParamsCToCpp::Wrap(params),
|
|
CefMenuModelCToCpp::Wrap(model));
|
|
}
|
|
|
|
int CEF_CALLBACK context_menu_handler_on_context_menu_command(
|
|
struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
|
|
struct _cef_frame_t* frame, struct _cef_context_menu_params_t* params,
|
|
int command_id, cef_event_flags_t event_flags) {
|
|
// 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: params; type: refptr_diff
|
|
DCHECK(params);
|
|
if (!params)
|
|
return 0;
|
|
|
|
// Execute
|
|
bool _retval = CefContextMenuHandlerCppToC::Get(self)->OnContextMenuCommand(
|
|
CefBrowserCToCpp::Wrap(browser),
|
|
CefFrameCToCpp::Wrap(frame),
|
|
CefContextMenuParamsCToCpp::Wrap(params),
|
|
command_id,
|
|
event_flags);
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
void CEF_CALLBACK context_menu_handler_on_context_menu_dismissed(
|
|
struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
|
|
struct _cef_frame_t* frame) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame);
|
|
if (!frame)
|
|
return;
|
|
|
|
// Execute
|
|
CefContextMenuHandlerCppToC::Get(self)->OnContextMenuDismissed(
|
|
CefBrowserCToCpp::Wrap(browser),
|
|
CefFrameCToCpp::Wrap(frame));
|
|
}
|
|
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefContextMenuHandlerCppToC::CefContextMenuHandlerCppToC(
|
|
CefContextMenuHandler* cls)
|
|
: CefCppToC<CefContextMenuHandlerCppToC, CefContextMenuHandler,
|
|
cef_context_menu_handler_t>(cls) {
|
|
struct_.struct_.on_before_context_menu =
|
|
context_menu_handler_on_before_context_menu;
|
|
struct_.struct_.on_context_menu_command =
|
|
context_menu_handler_on_context_menu_command;
|
|
struct_.struct_.on_context_menu_dismissed =
|
|
context_menu_handler_on_context_menu_dismissed;
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCppToC<CefContextMenuHandlerCppToC,
|
|
CefContextMenuHandler, cef_context_menu_handler_t>::DebugObjCt = 0;
|
|
#endif
|
|
|