mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 01:56:20 +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
127 lines
3.5 KiB
C++
127 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/urlrequest_client_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/request_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/response_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/urlrequest_ctocpp.h"
|
|
|
|
|
|
// STATIC METHODS - Body may be edited by hand.
|
|
|
|
CefRefPtr<CefURLRequest> CefURLRequest::Create(CefRefPtr<CefRequest> request,
|
|
CefRefPtr<CefURLRequestClient> client) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: request; type: refptr_same
|
|
DCHECK(request.get());
|
|
if (!request.get())
|
|
return NULL;
|
|
// Verify param: client; type: refptr_diff
|
|
DCHECK(client.get());
|
|
if (!client.get())
|
|
return NULL;
|
|
|
|
// Execute
|
|
cef_urlrequest_t* _retval = cef_urlrequest_create(
|
|
CefRequestCToCpp::Unwrap(request),
|
|
CefURLRequestClientCppToC::Wrap(client));
|
|
|
|
// Return type: refptr_same
|
|
return CefURLRequestCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
|
|
// VIRTUAL METHODS - Body may be edited by hand.
|
|
|
|
CefRefPtr<CefRequest> CefURLRequestCToCpp::GetRequest() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_request))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_request_t* _retval = struct_->get_request(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefRequestCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
CefRefPtr<CefURLRequestClient> CefURLRequestCToCpp::GetClient() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_client))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_urlrequest_client_t* _retval = struct_->get_client(struct_);
|
|
|
|
// Return type: refptr_diff
|
|
return CefURLRequestClientCppToC::Unwrap(_retval);
|
|
}
|
|
|
|
CefURLRequest::Status CefURLRequestCToCpp::GetRequestStatus() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_request_status))
|
|
return UR_UNKNOWN;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_urlrequest_status_t _retval = struct_->get_request_status(struct_);
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
CefURLRequest::ErrorCode CefURLRequestCToCpp::GetRequestError() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_request_error))
|
|
return ERR_NONE;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_errorcode_t _retval = struct_->get_request_error(struct_);
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
CefRefPtr<CefResponse> CefURLRequestCToCpp::GetResponse() {
|
|
if (CEF_MEMBER_MISSING(struct_, get_response))
|
|
return NULL;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
cef_response_t* _retval = struct_->get_response(struct_);
|
|
|
|
// Return type: refptr_same
|
|
return CefResponseCToCpp::Wrap(_retval);
|
|
}
|
|
|
|
void CefURLRequestCToCpp::Cancel() {
|
|
if (CEF_MEMBER_MISSING(struct_, cancel))
|
|
return;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Execute
|
|
struct_->cancel(struct_);
|
|
}
|
|
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCToCpp<CefURLRequestCToCpp, CefURLRequest,
|
|
cef_urlrequest_t>::DebugObjCt = 0;
|
|
#endif
|
|
|