Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit a06d4a0

Browse files
committed
[[ CEF ]] Update to 74.1.16+ge20b240+chromium-74.0.3729.131
1 parent af3ee6d commit a06d4a0

File tree

438 files changed

+16043
-11854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

438 files changed

+16043
-11854
lines changed

libcef/include/base/cef_basictypes.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ typedef int int32;
6464
typedef unsigned int uint32;
6565
#endif
6666

67+
#ifndef _INT16
68+
#define _INT16
69+
typedef short int16;
70+
#endif
71+
72+
#ifndef _UINT16
73+
#define _UINT16
74+
typedef unsigned short uint16;
75+
#endif
76+
6777
// UTF-16 character type.
6878
// This should be kept synchronized with base/strings/string16.h
6979
#ifndef char16

libcef/include/base/cef_build.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,16 @@
162162
#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
163163
#endif
164164

165+
// Sanitizers annotations.
166+
#if defined(__has_attribute)
167+
#if __has_attribute(no_sanitize)
168+
#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
169+
#endif
170+
#endif
171+
#if !defined(NO_SANITIZE)
172+
#define NO_SANITIZE(what)
173+
#endif
174+
165175
#endif // !USING_CHROMIUM_INCLUDES
166176

167177
// Annotate a virtual method indicating it must be overriding a virtual method

libcef/include/base/cef_ref_counted.h

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "include/base/cef_atomic_ref_count.h"
5252
#include "include/base/cef_build.h"
5353
#include "include/base/cef_logging.h"
54-
#include "include/base/cef_thread_collision_warner.h"
54+
#include "include/base/cef_macros.h"
5555

5656
namespace base {
5757

@@ -60,6 +60,7 @@ namespace cef_subtle {
6060
class RefCountedBase {
6161
public:
6262
bool HasOneRef() const { return ref_count_ == 1; }
63+
bool HasAtLeastOneRef() const { return ref_count_ >= 1; }
6364

6465
protected:
6566
RefCountedBase()
@@ -78,10 +79,6 @@ class RefCountedBase {
7879
}
7980

8081
void AddRef() const {
81-
// TODO(maruel): Add back once it doesn't assert 500 times/sec.
82-
// Current thread books the critical section "AddRelease"
83-
// without release it.
84-
// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
8582
#if DCHECK_IS_ON()
8683
DCHECK(!in_dtor_);
8784
#endif
@@ -90,10 +87,6 @@ class RefCountedBase {
9087

9188
// Returns true if the object should self-delete.
9289
bool Release() const {
93-
// TODO(maruel): Add back once it doesn't assert 500 times/sec.
94-
// Current thread books the critical section "AddRelease"
95-
// without release it.
96-
// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
9790
#if DCHECK_IS_ON()
9891
DCHECK(!in_dtor_);
9992
#endif
@@ -112,14 +105,13 @@ class RefCountedBase {
112105
mutable bool in_dtor_;
113106
#endif
114107

115-
DFAKE_MUTEX(add_release_);
116-
117108
DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
118109
};
119110

120111
class RefCountedThreadSafeBase {
121112
public:
122113
bool HasOneRef() const;
114+
bool HasAtLeastOneRef() const;
123115

124116
protected:
125117
RefCountedThreadSafeBase();

libcef/include/base/cef_string16.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ typedef std::char_traits<wchar_t> string16_char_traits;
8686

8787
#include "include/base/cef_macros.h"
8888

89+
namespace cef {
8990
namespace base {
9091

9192
typedef uint16_t char16;
@@ -156,7 +157,15 @@ struct string16_char_traits {
156157
static int_type eof() { return static_cast<int_type>(EOF); }
157158
};
158159

159-
typedef std::basic_string<char16, base::string16_char_traits> string16;
160+
typedef std::basic_string<char16, string16_char_traits> string16;
161+
162+
} // namespace base
163+
} // namespace cef
164+
165+
namespace base {
166+
167+
typedef cef::base::char16 char16;
168+
typedef cef::base::string16 string16;
160169

161170
extern std::ostream& operator<<(std::ostream& out, const string16& str);
162171

@@ -204,8 +213,8 @@ extern void PrintTo(const string16& str, std::ostream* out);
204213
//
205214
// TODO(mark): File this bug with Apple and update this note with a bug number.
206215

207-
extern template class std::basic_string<base::char16,
208-
base::string16_char_traits>;
216+
extern template class std::basic_string<cef::base::char16,
217+
cef::base::string16_char_traits>;
209218

210219
#endif // WCHAR_T_IS_UTF32
211220

0 commit comments

Comments
 (0)