mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-12 01:50:37 +01:00
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
155 lines
4.4 KiB
C++
155 lines
4.4 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/auth_callback_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/urlrequest_ctocpp.h"
|
|
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
void CEF_CALLBACK urlrequest_client_on_request_complete(
|
|
struct _cef_urlrequest_client_t* self, cef_urlrequest_t* request) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: request; type: refptr_diff
|
|
DCHECK(request);
|
|
if (!request)
|
|
return;
|
|
|
|
// Execute
|
|
CefURLRequestClientCppToC::Get(self)->OnRequestComplete(
|
|
CefURLRequestCToCpp::Wrap(request));
|
|
}
|
|
|
|
void CEF_CALLBACK urlrequest_client_on_upload_progress(
|
|
struct _cef_urlrequest_client_t* self, cef_urlrequest_t* request,
|
|
uint64 current, uint64 total) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: request; type: refptr_diff
|
|
DCHECK(request);
|
|
if (!request)
|
|
return;
|
|
|
|
// Execute
|
|
CefURLRequestClientCppToC::Get(self)->OnUploadProgress(
|
|
CefURLRequestCToCpp::Wrap(request),
|
|
current,
|
|
total);
|
|
}
|
|
|
|
void CEF_CALLBACK urlrequest_client_on_download_progress(
|
|
struct _cef_urlrequest_client_t* self, cef_urlrequest_t* request,
|
|
uint64 current, uint64 total) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: request; type: refptr_diff
|
|
DCHECK(request);
|
|
if (!request)
|
|
return;
|
|
|
|
// Execute
|
|
CefURLRequestClientCppToC::Get(self)->OnDownloadProgress(
|
|
CefURLRequestCToCpp::Wrap(request),
|
|
current,
|
|
total);
|
|
}
|
|
|
|
void CEF_CALLBACK urlrequest_client_on_download_data(
|
|
struct _cef_urlrequest_client_t* self, cef_urlrequest_t* request,
|
|
const void* data, size_t data_length) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: request; type: refptr_diff
|
|
DCHECK(request);
|
|
if (!request)
|
|
return;
|
|
// Verify param: data; type: simple_byaddr
|
|
DCHECK(data);
|
|
if (!data)
|
|
return;
|
|
|
|
// Execute
|
|
CefURLRequestClientCppToC::Get(self)->OnDownloadData(
|
|
CefURLRequestCToCpp::Wrap(request),
|
|
data,
|
|
data_length);
|
|
}
|
|
|
|
int CEF_CALLBACK urlrequest_client_get_auth_credentials(
|
|
struct _cef_urlrequest_client_t* self, int isProxy,
|
|
const cef_string_t* host, int port, const cef_string_t* realm,
|
|
const cef_string_t* scheme, cef_auth_callback_t* callback) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
// Verify param: host; type: string_byref_const
|
|
DCHECK(host);
|
|
if (!host)
|
|
return 0;
|
|
// Verify param: scheme; type: string_byref_const
|
|
DCHECK(scheme);
|
|
if (!scheme)
|
|
return 0;
|
|
// Verify param: callback; type: refptr_diff
|
|
DCHECK(callback);
|
|
if (!callback)
|
|
return 0;
|
|
// Unverified params: realm
|
|
|
|
// Execute
|
|
bool _retval = CefURLRequestClientCppToC::Get(self)->GetAuthCredentials(
|
|
isProxy?true:false,
|
|
CefString(host),
|
|
port,
|
|
CefString(realm),
|
|
CefString(scheme),
|
|
CefAuthCallbackCToCpp::Wrap(callback));
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefURLRequestClientCppToC::CefURLRequestClientCppToC(CefURLRequestClient* cls)
|
|
: CefCppToC<CefURLRequestClientCppToC, CefURLRequestClient,
|
|
cef_urlrequest_client_t>(cls) {
|
|
struct_.struct_.on_request_complete = urlrequest_client_on_request_complete;
|
|
struct_.struct_.on_upload_progress = urlrequest_client_on_upload_progress;
|
|
struct_.struct_.on_download_progress = urlrequest_client_on_download_progress;
|
|
struct_.struct_.on_download_data = urlrequest_client_on_download_data;
|
|
struct_.struct_.get_auth_credentials = urlrequest_client_get_auth_credentials;
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCppToC<CefURLRequestClientCppToC,
|
|
CefURLRequestClient, cef_urlrequest_client_t>::DebugObjCt = 0;
|
|
#endif
|
|
|