mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-07 15:53: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
153 lines
4.2 KiB
C++
153 lines
4.2 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/request_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/response_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/urlrequest_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/urlrequest_client_ctocpp.h"
|
|
|
|
|
|
// GLOBAL FUNCTIONS - Body may be edited by hand.
|
|
|
|
CEF_EXPORT cef_urlrequest_t* cef_urlrequest_create(cef_request_t* request,
|
|
struct _cef_urlrequest_client_t* client) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: request; type: refptr_same
|
|
DCHECK(request);
|
|
if (!request)
|
|
return NULL;
|
|
// Verify param: client; type: refptr_diff
|
|
DCHECK(client);
|
|
if (!client)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefURLRequest> _retval = CefURLRequest::Create(
|
|
CefRequestCppToC::Unwrap(request),
|
|
CefURLRequestClientCToCpp::Wrap(client));
|
|
|
|
// Return type: refptr_same
|
|
return CefURLRequestCppToC::Wrap(_retval);
|
|
}
|
|
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
cef_request_t* CEF_CALLBACK urlrequest_get_request(
|
|
struct _cef_urlrequest_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefRequest> _retval = CefURLRequestCppToC::Get(self)->GetRequest();
|
|
|
|
// Return type: refptr_same
|
|
return CefRequestCppToC::Wrap(_retval);
|
|
}
|
|
|
|
struct _cef_urlrequest_client_t* CEF_CALLBACK urlrequest_get_client(
|
|
struct _cef_urlrequest_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefURLRequestClient> _retval = CefURLRequestCppToC::Get(
|
|
self)->GetClient();
|
|
|
|
// Return type: refptr_diff
|
|
return CefURLRequestClientCToCpp::Unwrap(_retval);
|
|
}
|
|
|
|
cef_urlrequest_status_t CEF_CALLBACK urlrequest_get_request_status(
|
|
struct _cef_urlrequest_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return UR_UNKNOWN;
|
|
|
|
// Execute
|
|
cef_urlrequest_status_t _retval = CefURLRequestCppToC::Get(
|
|
self)->GetRequestStatus();
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
cef_errorcode_t CEF_CALLBACK urlrequest_get_request_error(
|
|
struct _cef_urlrequest_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return ERR_NONE;
|
|
|
|
// Execute
|
|
cef_errorcode_t _retval = CefURLRequestCppToC::Get(self)->GetRequestError();
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
cef_response_t* CEF_CALLBACK urlrequest_get_response(
|
|
struct _cef_urlrequest_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefResponse> _retval = CefURLRequestCppToC::Get(self)->GetResponse(
|
|
);
|
|
|
|
// Return type: refptr_same
|
|
return CefResponseCppToC::Wrap(_retval);
|
|
}
|
|
|
|
void CEF_CALLBACK urlrequest_cancel(struct _cef_urlrequest_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
|
|
// Execute
|
|
CefURLRequestCppToC::Get(self)->Cancel();
|
|
}
|
|
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefURLRequestCppToC::CefURLRequestCppToC(CefURLRequest* cls)
|
|
: CefCppToC<CefURLRequestCppToC, CefURLRequest, cef_urlrequest_t>(cls) {
|
|
struct_.struct_.get_request = urlrequest_get_request;
|
|
struct_.struct_.get_client = urlrequest_get_client;
|
|
struct_.struct_.get_request_status = urlrequest_get_request_status;
|
|
struct_.struct_.get_request_error = urlrequest_get_request_error;
|
|
struct_.struct_.get_response = urlrequest_get_response;
|
|
struct_.struct_.cancel = urlrequest_cancel;
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCppToC<CefURLRequestCppToC, CefURLRequest,
|
|
cef_urlrequest_t>::DebugObjCt = 0;
|
|
#endif
|
|
|