mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-14 10:34:29 +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
95 lines
1.9 KiB
C++
95 lines
1.9 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.
|
|
|
|
#include "cefclient/bytes_write_handler.h"
|
|
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
|
|
#include "include/wrapper/cef_helpers.h"
|
|
|
|
BytesWriteHandler::BytesWriteHandler(size_t grow)
|
|
: grow_(grow),
|
|
datasize_(grow),
|
|
offset_(0) {
|
|
DCHECK_GT(grow, 0U);
|
|
data_ = malloc(grow);
|
|
DCHECK(data_ != NULL);
|
|
}
|
|
|
|
BytesWriteHandler::~BytesWriteHandler() {
|
|
if (data_)
|
|
free(data_);
|
|
}
|
|
|
|
size_t BytesWriteHandler::Write(const void* ptr, size_t size, size_t n) {
|
|
base::AutoLock lock_scope(lock_);
|
|
size_t rv;
|
|
if (offset_ + static_cast<int64>(size * n) >= datasize_ &&
|
|
Grow(size * n) == 0) {
|
|
rv = 0;
|
|
} else {
|
|
memcpy(reinterpret_cast<char*>(data_) + offset_, ptr, size * n);
|
|
offset_ += size * n;
|
|
rv = n;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
int BytesWriteHandler::Seek(int64 offset, int whence) {
|
|
int rv = -1L;
|
|
base::AutoLock lock_scope(lock_);
|
|
switch (whence) {
|
|
case SEEK_CUR:
|
|
if (offset_ + offset > datasize_ || offset_ + offset < 0)
|
|
break;
|
|
offset_ += offset;
|
|
rv = 0;
|
|
break;
|
|
case SEEK_END: {
|
|
int64 offset_abs = std::abs(offset);
|
|
if (offset_abs > datasize_)
|
|
break;
|
|
offset_ = datasize_ - offset_abs;
|
|
rv = 0;
|
|
break;
|
|
}
|
|
case SEEK_SET:
|
|
if (offset > datasize_ || offset < 0)
|
|
break;
|
|
offset_ = offset;
|
|
rv = 0;
|
|
break;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
int64 BytesWriteHandler::Tell() {
|
|
base::AutoLock lock_scope(lock_);
|
|
return offset_;
|
|
}
|
|
|
|
int BytesWriteHandler::Flush() {
|
|
return 0;
|
|
}
|
|
|
|
size_t BytesWriteHandler::Grow(size_t size) {
|
|
base::AutoLock lock_scope(lock_);
|
|
size_t rv;
|
|
size_t s = (size > grow_ ? size : grow_);
|
|
void* tmp = realloc(data_, datasize_ + s);
|
|
DCHECK(tmp != NULL);
|
|
if (tmp) {
|
|
data_ = tmp;
|
|
datasize_ += s;
|
|
rv = datasize_;
|
|
} else {
|
|
rv = 0;
|
|
}
|
|
|
|
return rv;
|
|
}
|