Skip to content

Commit 7a587f5

Browse files
cztomczakcztomczak
committed
Update CEF headers to Chromium 49.0.2623.110 / CEF 3.2623.1401.gb90a3be.
Issue cztomczak#460.
1 parent 1cf3e1d commit 7a587f5

File tree

136 files changed

+1292
-6175
lines changed

Some content is hidden

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

136 files changed

+1292
-6175
lines changed

‎src/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(USING_CHROMIUM_INCLUDES)
47+
#elif defined(BUILDING_CEF_SHARED)
4848
// When building CEF include the Chromium header directly.
4949
#include "base/atomic_ref_count.h"
50-
#else // !USING_CHROMIUM_INCLUDES
50+
#else // !BUILDING_CEF_SHARED
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 // !USING_CHROMIUM_INCLUDES
124+
#endif // !BUILDING_CEF_SHARED
125125

126126
#endif // CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_

‎src/include/base/cef_atomicops.h‎

Lines changed: 3 additions & 5 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(USING_CHROMIUM_INCLUDES)
62+
#elif defined(BUILDING_CEF_SHARED)
6363
// When building CEF include the Chromium header directly.
6464
#include "base/atomicops.h"
65-
#else // !USING_CHROMIUM_INCLUDES
65+
#else // !BUILDING_CEF_SHARED
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.
@@ -183,8 +183,6 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
183183
#include "include/base/internal/cef_atomicops_mac.h"
184184
#elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
185185
#include "include/base/internal/cef_atomicops_x86_gcc.h"
186-
#elif defined(COMPILER_GCC) && defined(__ARM_ARCH)
187-
#include "include/base/internal/cef_atomicops_arm_gcc.h"
188186
#else
189187
#error "Atomic operations are not supported on your platform"
190188
#endif
@@ -195,6 +193,6 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
195193
#include "include/base/internal/cef_atomicops_atomicword_compat.h"
196194
#endif
197195

198-
#endif // !USING_CHROMIUM_INCLUDES
196+
#endif // !BUILDING_CEF_SHARED
199197

200198
#endif // CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_

‎src/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(USING_CHROMIUM_INCLUDES)
40+
#elif defined(BUILDING_CEF_SHARED)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/bind.h"
43-
#else // !USING_CHROMIUM_INCLUDES
43+
#else // !BUILDING_CEF_SHARED
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 // !USING_CHROMIUM_INCLUDES
546+
#endif // !BUILDING_CEF_SHARED
547547

548548
#endif // CEF_INCLUDE_BASE_CEF_BIND_H_

‎src/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(USING_CHROMIUM_INCLUDES)
178+
#elif defined(BUILDING_CEF_SHARED)
179179
// When building CEF include the Chromium header directly.
180180
#include "base/bind_helpers.h"
181-
#else // !USING_CHROMIUM_INCLUDES
181+
#else // !BUILDING_CEF_SHARED
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 // !USING_CHROMIUM_INCLUDES
584+
#endif // !BUILDING_CEF_SHARED
585585

586586
#endif // CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_

‎src/include/base/cef_build.h‎

Lines changed: 3 additions & 12 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(USING_CHROMIUM_INCLUDES)
35+
#if defined(BUILDING_CEF_SHARED)
3636
// When building CEF include the Chromium header directly.
3737
#include "base/compiler_specific.h"
38-
#else // !USING_CHROMIUM_INCLUDES
38+
#else // !BUILDING_CEF_SHARED
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.
@@ -165,7 +165,7 @@
165165
#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
166166
#endif
167167

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

170170
// Annotate a virtual method indicating it must be overriding a virtual method
171171
// in the parent class.
@@ -189,13 +189,4 @@
189189
#endif
190190
#endif // OVERRIDE
191191

192-
// Check for C++11 template alias support which was added in VS2013 and GCC4.7.
193-
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
194-
#if __cplusplus > 199711L || \
195-
(defined(_MSC_VER) && _MSC_VER >= 1800) || \
196-
(defined(__GNUC__) && \
197-
(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
198-
#define HAS_CPP11_TEMPLATE_ALIAS_SUPPORT
199-
#endif
200-
201192
#endif // CEF_INCLUDE_BASE_CEF_BUILD_H_

‎src/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(USING_CHROMIUM_INCLUDES)
40+
#elif defined(BUILDING_CEF_SHARED)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/callback.h"
43-
#else // !USING_CHROMIUM_INCLUDES
43+
#else // !BUILDING_CEF_SHARED
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 // !USING_CHROMIUM_INCLUDES
805+
#endif // !BUILDING_CEF_SHARED
806806

807807
#endif // CEF_INCLUDE_BASE_CEF_CALLBACK_H_

‎src/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(USING_CHROMIUM_INCLUDES)
40+
#elif defined(BUILDING_CEF_SHARED)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/callback_forward.h"
43-
#else // !USING_CHROMIUM_INCLUDES
43+
#else // !BUILDING_CEF_SHARED
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 // !!USING_CHROMIUM_INCLUDES
57+
#endif // !!BUILDING_CEF_SHARED
5858

5959
#endif // INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_

‎src/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(USING_CHROMIUM_INCLUDES)
49+
#elif defined(BUILDING_CEF_SHARED)
5050
// When building CEF include the Chromium header directly.
5151
#include "base/callback_helpers.h"
52-
#else // !USING_CHROMIUM_INCLUDES
52+
#else // !BUILDING_CEF_SHARED
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 // !USING_CHROMIUM_INCLUDES
91+
#endif // !BUILDING_CEF_SHARED
9292

9393
#endif // CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_

‎src/include/base/cef_callback_list.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(USING_CHROMIUM_INCLUDES)
40+
#elif defined(BUILDING_CEF_SHARED)
4141
// When building CEF include the Chromium header directly.
4242
#include "base/callback_list.h"
43-
#else // !USING_CHROMIUM_INCLUDES
43+
#else // !BUILDING_CEF_SHARED
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.
@@ -439,6 +439,6 @@ class CallbackList<void(A1, A2, A3, A4, A5, A6, A7)>
439439

440440
} // namespace base
441441

442-
#endif // !USING_CHROMIUM_INCLUDES
442+
#endif // !BUILDING_CEF_SHARED
443443

444444
#endif // CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_

‎src/include/base/cef_cancelable_callback.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
// This can happen in cases where Chromium code is used directly by the
7575
// client application. When using Chromium code directly always include
7676
// the Chromium header first to avoid type conflicts.
77-
#elif defined(USING_CHROMIUM_INCLUDES)
77+
#elif defined(BUILDING_CEF_SHARED)
7878
// When building CEF include the Chromium header directly.
7979
#include "base/cancelable_callback.h"
80-
#else // !USING_CHROMIUM_INCLUDES
80+
#else // !BUILDING_CEF_SHARED
8181
// The following is substantially similar to the Chromium implementation.
8282
// If the Chromium implementation diverges the below implementation should be
8383
// updated to match.
@@ -309,6 +309,6 @@ typedef CancelableCallback<void(void)> CancelableClosure;
309309

310310
} // namespace base
311311

312-
#endif // !USING_CHROMIUM_INCLUDES
312+
#endif // !BUILDING_CEF_SHARED
313313

314314
#endif // CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_

0 commit comments

Comments
 (0)