mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-28 18:19:56 +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
173 lines
4.4 KiB
C++
173 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/stream_reader_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/read_handler_ctocpp.h"
|
|
|
|
|
|
// GLOBAL FUNCTIONS - Body may be edited by hand.
|
|
|
|
CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_file(
|
|
const cef_string_t* fileName) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: fileName; type: string_byref_const
|
|
DCHECK(fileName);
|
|
if (!fileName)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefStreamReader> _retval = CefStreamReader::CreateForFile(
|
|
CefString(fileName));
|
|
|
|
// Return type: refptr_same
|
|
return CefStreamReaderCppToC::Wrap(_retval);
|
|
}
|
|
|
|
CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_data(void* data,
|
|
size_t size) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: data; type: simple_byaddr
|
|
DCHECK(data);
|
|
if (!data)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefStreamReader> _retval = CefStreamReader::CreateForData(
|
|
data,
|
|
size);
|
|
|
|
// Return type: refptr_same
|
|
return CefStreamReaderCppToC::Wrap(_retval);
|
|
}
|
|
|
|
CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_handler(
|
|
cef_read_handler_t* handler) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: handler; type: refptr_diff
|
|
DCHECK(handler);
|
|
if (!handler)
|
|
return NULL;
|
|
|
|
// Execute
|
|
CefRefPtr<CefStreamReader> _retval = CefStreamReader::CreateForHandler(
|
|
CefReadHandlerCToCpp::Wrap(handler));
|
|
|
|
// Return type: refptr_same
|
|
return CefStreamReaderCppToC::Wrap(_retval);
|
|
}
|
|
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
size_t CEF_CALLBACK stream_reader_read(struct _cef_stream_reader_t* self,
|
|
void* ptr, size_t size, size_t n) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
// Verify param: ptr; type: simple_byaddr
|
|
DCHECK(ptr);
|
|
if (!ptr)
|
|
return 0;
|
|
|
|
// Execute
|
|
size_t _retval = CefStreamReaderCppToC::Get(self)->Read(
|
|
ptr,
|
|
size,
|
|
n);
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
int CEF_CALLBACK stream_reader_seek(struct _cef_stream_reader_t* self,
|
|
int64 offset, int whence) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
|
|
// Execute
|
|
int _retval = CefStreamReaderCppToC::Get(self)->Seek(
|
|
offset,
|
|
whence);
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
int64 CEF_CALLBACK stream_reader_tell(struct _cef_stream_reader_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
|
|
// Execute
|
|
int64 _retval = CefStreamReaderCppToC::Get(self)->Tell();
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
int CEF_CALLBACK stream_reader_eof(struct _cef_stream_reader_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
|
|
// Execute
|
|
int _retval = CefStreamReaderCppToC::Get(self)->Eof();
|
|
|
|
// Return type: simple
|
|
return _retval;
|
|
}
|
|
|
|
int CEF_CALLBACK stream_reader_may_block(struct _cef_stream_reader_t* self) {
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
|
|
// Execute
|
|
bool _retval = CefStreamReaderCppToC::Get(self)->MayBlock();
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefStreamReaderCppToC::CefStreamReaderCppToC(CefStreamReader* cls)
|
|
: CefCppToC<CefStreamReaderCppToC, CefStreamReader, cef_stream_reader_t>(
|
|
cls) {
|
|
struct_.struct_.read = stream_reader_read;
|
|
struct_.struct_.seek = stream_reader_seek;
|
|
struct_.struct_.tell = stream_reader_tell;
|
|
struct_.struct_.eof = stream_reader_eof;
|
|
struct_.struct_.may_block = stream_reader_may_block;
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
template<> base::AtomicRefCount CefCppToC<CefStreamReaderCppToC,
|
|
CefStreamReader, cef_stream_reader_t>::DebugObjCt = 0;
|
|
#endif
|
|
|