Introduce the use of Chromium types (issue #1336).

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
This commit is contained in:
Marshall Greenblatt
2014-07-14 22:18:51 +00:00
parent c260a2d166
commit 122397acfc
314 changed files with 13077 additions and 1242 deletions

View File

@@ -39,45 +39,45 @@ CefResponseImpl::CefResponseImpl()
}
bool CefResponseImpl::IsReadOnly() {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
return read_only_;
}
int CefResponseImpl::GetStatus() {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
return status_code_;
}
void CefResponseImpl::SetStatus(int status) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
status_code_ = status;
}
CefString CefResponseImpl::GetStatusText() {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
return status_text_;
}
void CefResponseImpl::SetStatusText(const CefString& statusText) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
status_text_ = statusText;
}
CefString CefResponseImpl::GetMimeType() {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
return mime_type_;
}
void CefResponseImpl::SetMimeType(const CefString& mimeType) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
mime_type_ = mimeType;
}
CefString CefResponseImpl::GetHeader(const CefString& name) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
CefString value;
@@ -89,18 +89,18 @@ CefString CefResponseImpl::GetHeader(const CefString& name) {
}
void CefResponseImpl::GetHeaderMap(HeaderMap& map) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
map = header_map_;
}
void CefResponseImpl::SetHeaderMap(const HeaderMap& headerMap) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
header_map_ = headerMap;
}
net::HttpResponseHeaders* CefResponseImpl::GetResponseHeaders() {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
std::string response;
std::string status_text;
@@ -151,7 +151,7 @@ net::HttpResponseHeaders* CefResponseImpl::GetResponseHeaders() {
void CefResponseImpl::SetResponseHeaders(
const net::HttpResponseHeaders& headers) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
header_map_.empty();
@@ -171,7 +171,7 @@ void CefResponseImpl::SetResponseHeaders(
void CefResponseImpl::Set(const blink::WebURLResponse& response) {
DCHECK(!response.isNull());
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
blink::WebString str;
@@ -200,6 +200,6 @@ void CefResponseImpl::Set(const blink::WebURLResponse& response) {
}
void CefResponseImpl::SetReadOnly(bool read_only) {
AutoLock lock_scope(this);
base::AutoLock lock_scope(lock_);
read_only_ = read_only;
}