bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- Move include/cef_build.h to include/base/cef_build.h.
- Move libcef_dll/cef_macros.h to include/base/cef_macros.h.
- Move include/cef_trace_event.h to include/base/cef_trace_event.h and include/internal/cef_trace_event_internal.h.
- Remove the "CEF_" prefix from TRACE macros.
- Add new include/base/cef_logging.h and include/internal/cef_logging_internal.h for logging support.
- Add new include/wrapper/cef_helpers.h for CEF_REQUIRE_*_THREAD macros and CefScopedArgArray.
- Delete the util.h headers used by tests that duplicated the above functionality.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1767 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-07-11 20:10:05 +00:00
parent b9781aa000
commit 6702fc573a
79 changed files with 2335 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libcef_dll/ctocpp/base_ctocpp.h
View File

@@ -6,9 +6,10 @@
#define CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_
#pragma once
#include "include/base/cef_logging.h"
#include "include/base/cef_macros.h"
#include "include/cef_base.h"
#include "include/capi/cef_base_capi.h"
#include "libcef_dll/cef_logging.h"
// CefCToCpp implementation for CefBase.
@@ -89,9 +90,11 @@ class CefBaseCToCpp : public CefBase {
return struct_->get_refct(struct_);
}
protected:
private:
CefRefCount refct_;
cef_base_t* struct_;
DISALLOW_COPY_AND_ASSIGN(CefBaseCToCpp);
};

4
libcef_dll/ctocpp/command_line_ctocpp.cc
View File

@@ -21,7 +21,7 @@ CefRefPtr<CefCommandLine> CefCommandLine::CreateCommandLine() {
const char* api_hash = cef_api_hash(0);
if (strcmp(api_hash, CEF_API_HASH_PLATFORM)) {
// The libcef API hash does not match the current header API hash.
DCHECK(false);
NOTREACHED();
return NULL;
}
@@ -38,7 +38,7 @@ CefRefPtr<CefCommandLine> CefCommandLine::GetGlobalCommandLine() {
const char* api_hash = cef_api_hash(0);
if (strcmp(api_hash, CEF_API_HASH_PLATFORM)) {
// The libcef API hash does not match the current header API hash.
DCHECK(false);
NOTREACHED();
return NULL;
}

7
libcef_dll/ctocpp/ctocpp.h
View File

@@ -6,10 +6,10 @@
#define CEF_LIBCEF_DLL_CTOCPP_CTOCPP_H_
#pragma once
#include "include/base/cef_logging.h"
#include "include/base/cef_macros.h"
#include "include/cef_base.h"
#include "include/capi/cef_base_capi.h"
#include "libcef_dll/cef_logging.h"
// Wrap a C structure with a C++ class. This is used when the implementation
// exists on the other side of the DLL boundary but will have methods called on
@@ -108,6 +108,9 @@ class CefCToCpp : public BaseName {
protected:
CefRefCount refct_;
StructName* struct_;
private:
DISALLOW_COPY_AND_ASSIGN(CefCToCpp);
};
#endif // CEF_LIBCEF_DLL_CTOCPP_CTOCPP_H_