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

Commit c85909f

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'origin/develop' into update-skia
2 parents 9255110 + 45145d4 commit c85909f

181 files changed

Lines changed: 25293 additions & 3028 deletions

File tree

Some content is hidden

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

‎libcef/gen_libcef_stubs.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"uint64":"integer64",
1414
"double":"double",
1515
"void":"",
16-
"size_t":"integer",
16+
"size_t":"intsize",
17+
"time_t":"integer64",
1718
"cef_json_parser_options_t":"integer",
1819
"cef_json_writer_options_t":"integer",
1920
"cef_path_key_t":"integer",
@@ -120,13 +121,12 @@ def gen_stubs_file(pPaths):
120121

121122
tSignatureList.sort()
122123

123-
print "cef libcef.so libcef.dylib libcef.dll"
124+
print "cef ./CEF/libcef ./CEF/libcef ./CEF/libcef"
124125
print "\n".join(tSignatureList)
125126

126-
127127
#get include folder from the command line
128128
tPaths = ["."]
129129
if len(sys.argv) > 1:
130130
tPaths = sys.argv[1:]
131-
131+
132132
gen_stubs_file(tPaths)

‎libcef/include/base/cef_atomic_ref_count.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
// This can happen in cases where Chromium code is used directly by the
4545
// client application. When using Chromium code directly always include
4646
// the Chromium header first to avoid type conflicts.
47-
#elif defined(BUILDING_CEF_SHARED)
47+
#elif defined(USING_CHROMIUM_INCLUDES)
4848
// When building CEF include the Chromium header directly.
4949
#include "base/atomic_ref_count.h"
50-
#else // !BUILDING_CEF_SHARED
50+
#else // !USING_CHROMIUM_INCLUDES
5151
// The following is substantially similar to the Chromium implementation.
5252
// If the Chromium implementation diverges the below implementation should be
5353
// updated to match.
@@ -121,6 +121,6 @@ inline bool AtomicRefCountIsZero(volatile AtomicRefCount *ptr) {
121121

122122
} // namespace base
123123

124-
#endif // !BUILDING_CEF_SHARED
124+
#endif // !USING_CHROMIUM_INCLUDES
125125

126126
#endif // CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_

‎libcef/include/base/cef_atomicops.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
// This can happen in cases where Chromium code is used directly by the
6060
// client application. When using Chromium code directly always include
6161
// the Chromium header first to avoid type conflicts.
62-
#elif defined(BUILDING_CEF_SHARED)
62+
#elif defined(USING_CHROMIUM_INCLUDES)
6363
// When building CEF include the Chromium header directly.
6464
#include "base/atomicops.h"
65-
#else // !BUILDING_CEF_SHARED
65+
#else // !USING_CHROMIUM_INCLUDES
6666
// The following is substantially similar to the Chromium implementation.
6767
// If the Chromium implementation diverges the below implementation should be
6868
// updated to match.
@@ -193,6 +193,6 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
193193
#include "include/base/internal/cef_atomicops_atomicword_compat.h"
194194
#endif
195195

196-
#endif // !BUILDING_CEF_SHARED
196+
#endif // !USING_CHROMIUM_INCLUDES
197197

198198
#endif // CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_

‎libcef/include/base/cef_basictypes.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@
3232
#define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
3333
#pragma once
3434

35-
#if defined(BUILDING_CEF_SHARED)
36-
// When building CEF include the Chromium header directly.
37-
#include "base/basictypes.h"
38-
#else // !BUILDING_CEF_SHARED
39-
// The following is substantially similar to the Chromium implementation.
40-
// If the Chromium implementation diverges the below implementation should be
41-
// updated to match.
42-
4335
#include <limits.h> // For UINT_MAX
4436
#include <stddef.h> // For size_t
4537

@@ -72,8 +64,6 @@ typedef int int32;
7264
typedef unsigned int uint32;
7365
#endif
7466

75-
#endif // !BUILDING_CEF_SHARED
76-
7767
// UTF-16 character type.
7868
// This should be kept synchronized with base/strings/string16.h
7969
#ifndef char16

‎libcef/include/base/cef_bind.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
// This can happen in cases where Chromium code is used directly by the
3838
// client application. When using Chromium code directly always include
3939
// the Chromium header first to avoid type conflicts.
40-
#elif defined(BUILDING_CEF_SHARED)
40+
#elif defined(USING_CHROMIUM_INCLUDES)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/bind.h"
43-
#else // !BUILDING_CEF_SHARED
43+
#else // !USING_CHROMIUM_INCLUDES
4444
// The following is substantially similar to the Chromium implementation.
4545
// If the Chromium implementation diverges the below implementation should be
4646
// updated to match.
@@ -543,6 +543,6 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
543543

544544
} // namespace base
545545

546-
#endif // !BUILDING_CEF_SHARED
546+
#endif // !USING_CHROMIUM_INCLUDES
547547

548548
#endif // CEF_INCLUDE_BASE_CEF_BIND_H_

‎libcef/include/base/cef_bind_helpers.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@
175175
// This can happen in cases where Chromium code is used directly by the
176176
// client application. When using Chromium code directly always include
177177
// the Chromium header first to avoid type conflicts.
178-
#elif defined(BUILDING_CEF_SHARED)
178+
#elif defined(USING_CHROMIUM_INCLUDES)
179179
// When building CEF include the Chromium header directly.
180180
#include "base/bind_helpers.h"
181-
#else // !BUILDING_CEF_SHARED
181+
#else // !USING_CHROMIUM_INCLUDES
182182
// The following is substantially similar to the Chromium implementation.
183183
// If the Chromium implementation diverges the below implementation should be
184184
// updated to match.
@@ -581,6 +581,6 @@ void DeletePointer(T* obj) {
581581

582582
} // namespace base
583583

584-
#endif // !BUILDING_CEF_SHARED
584+
#endif // !USING_CHROMIUM_INCLUDES
585585

586586
#endif // CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_

‎libcef/include/base/cef_build.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
#define CEF_INCLUDE_BASE_CEF_BUILD_H_
3333
#pragma once
3434

35-
#if defined(BUILDING_CEF_SHARED)
35+
#if defined(USING_CHROMIUM_INCLUDES)
3636
// When building CEF include the Chromium header directly.
3737
#include "base/compiler_specific.h"
38-
#else // !BUILDING_CEF_SHARED
38+
#else // !USING_CHROMIUM_INCLUDES
3939
// The following is substantially similar to the Chromium implementation.
4040
// If the Chromium implementation diverges the below implementation should be
4141
// updated to match.
@@ -135,7 +135,7 @@
135135
// Annotate a function indicating the caller must examine the return value.
136136
// Use like:
137137
// int foo() WARN_UNUSED_RESULT;
138-
// To explicitly ignore a result, see |ignore_result()| in <base/basictypes.h>.
138+
// To explicitly ignore a result, see |ignore_result()| in <base/macros.h>.
139139
#ifndef WARN_UNUSED_RESULT
140140
#if defined(COMPILER_GCC)
141141
#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
@@ -165,7 +165,7 @@
165165
#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
166166
#endif
167167

168-
#endif // !BUILDING_CEF_SHARED
168+
#endif // !USING_CHROMIUM_INCLUDES
169169

170170
// Annotate a virtual method indicating it must be overriding a virtual method
171171
// in the parent class.

‎libcef/include/base/cef_callback.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
// This can happen in cases where Chromium code is used directly by the
3838
// client application. When using Chromium code directly always include
3939
// the Chromium header first to avoid type conflicts.
40-
#elif defined(BUILDING_CEF_SHARED)
40+
#elif defined(USING_CHROMIUM_INCLUDES)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/callback.h"
43-
#else // !BUILDING_CEF_SHARED
43+
#else // !USING_CHROMIUM_INCLUDES
4444
// The following is substantially similar to the Chromium implementation.
4545
// If the Chromium implementation diverges the below implementation should be
4646
// updated to match.
@@ -802,6 +802,6 @@ typedef Callback<void(void)> Closure;
802802

803803
} // namespace base
804804

805-
#endif // !BUILDING_CEF_SHARED
805+
#endif // !USING_CHROMIUM_INCLUDES
806806

807807
#endif // CEF_INCLUDE_BASE_CEF_CALLBACK_H_

‎libcef/include/base/cef_callback_forward.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
// This can happen in cases where Chromium code is used directly by the
3838
// client application. When using Chromium code directly always include
3939
// the Chromium header first to avoid type conflicts.
40-
#elif defined(BUILDING_CEF_SHARED)
40+
#elif defined(USING_CHROMIUM_INCLUDES)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/callback_forward.h"
43-
#else // !BUILDING_CEF_SHARED
43+
#else // !USING_CHROMIUM_INCLUDES
4444
// The following is substantially similar to the Chromium implementation.
4545
// If the Chromium implementation diverges the below implementation should be
4646
// updated to match.
@@ -54,6 +54,6 @@ typedef Callback<void(void)> Closure;
5454

5555
} // namespace base
5656

57-
#endif // !!BUILDING_CEF_SHARED
57+
#endif // !!USING_CHROMIUM_INCLUDES
5858

5959
#endif // INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_

‎libcef/include/base/cef_callback_helpers.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
// This can happen in cases where Chromium code is used directly by the
4747
// client application. When using Chromium code directly always include
4848
// the Chromium header first to avoid type conflicts.
49-
#elif defined(BUILDING_CEF_SHARED)
49+
#elif defined(USING_CHROMIUM_INCLUDES)
5050
// When building CEF include the Chromium header directly.
5151
#include "base/callback_helpers.h"
52-
#else // !BUILDING_CEF_SHARED
52+
#else // !USING_CHROMIUM_INCLUDES
5353
// The following is substantially similar to the Chromium implementation.
5454
// If the Chromium implementation diverges the below implementation should be
5555
// updated to match.
@@ -88,6 +88,6 @@ class ScopedClosureRunner {
8888

8989
} // namespace base
9090

91-
#endif // !BUILDING_CEF_SHARED
91+
#endif // !USING_CHROMIUM_INCLUDES
9292

9393
#endif // CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_

0 commit comments

Comments
 (0)