Tom Callaway
8 years ago
commit
3739ffe4a2
@ -0,0 +1,12 @@
|
|||||||
|
diff -up chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc
|
||||||
|
--- chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 2017-03-28 11:42:53.308857207 -0400
|
||||||
|
+++ chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc 2017-03-28 11:43:04.172579015 -0400
|
||||||
|
@@ -676,7 +676,7 @@ std::unique_ptr<views::Border> GtkUi::Cr
|
||||||
|
: nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
- return gtk_border;
|
||||||
|
+ return std::move(gtk_border);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GtkUi::AddWindowButtonOrderObserver(
|
||||||
@ -1,3 +1,3 @@
|
|||||||
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
|
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
|
||||||
SHA512 (policy_templates.zip) = 6a0564da805ee8d290453c9e46550fa8eed42d0fbd51a90eda566d888d9d7cf35ec9bb39f2340ec1ed98e7e813815eceb1f11cd202746815a7c8f8ecbef73a85
|
SHA512 (policy_templates.zip) = 6a0564da805ee8d290453c9e46550fa8eed42d0fbd51a90eda566d888d9d7cf35ec9bb39f2340ec1ed98e7e813815eceb1f11cd202746815a7c8f8ecbef73a85
|
||||||
SHA512 (chromium-57.0.2987.110-clean.tar.xz) = 9ea6a1ef5a553f9a51470248b8c0bb52ba8ff157aa6bc12515d8e589eff5e9dcaa55e37f5de4241bac96694c9b41ea260f827425ce1f07d5244369249373d4fc
|
SHA512 (chromium-57.0.2987.133-clean.tar.xz) = 5b5b3b9b8da008c04a8519eee1199e042bd1ee022e3eeb22eb10c075aeac64abe9312350cb867ab17854815d2aaf91fb6387b45f41f475fd854ee20e47d49ef8
|
||||||
|
|||||||
@ -0,0 +1,173 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of FFmpeg.
|
||||||
|
*
|
||||||
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* based on vlc_atomic.h from VLC
|
||||||
|
* Copyright (C) 2010 Rémi Denis-Courmont
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef COMPAT_ATOMICS_GCC_STDATOMIC_H
|
||||||
|
#define COMPAT_ATOMICS_GCC_STDATOMIC_H
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#define ATOMIC_FLAG_INIT 0
|
||||||
|
|
||||||
|
#define ATOMIC_VAR_INIT(value) (value)
|
||||||
|
|
||||||
|
#define atomic_init(obj, value) \
|
||||||
|
do { \
|
||||||
|
*(obj) = (value); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
#define kill_dependency(y) ((void)0)
|
||||||
|
|
||||||
|
#define atomic_thread_fence(order) \
|
||||||
|
__sync_synchronize()
|
||||||
|
|
||||||
|
#define atomic_signal_fence(order) \
|
||||||
|
((void)0)
|
||||||
|
|
||||||
|
#define atomic_is_lock_free(obj) 0
|
||||||
|
|
||||||
|
typedef _Bool atomic_flag;
|
||||||
|
typedef _Bool atomic_bool;
|
||||||
|
typedef char atomic_char;
|
||||||
|
typedef signed char atomic_schar;
|
||||||
|
typedef unsigned char atomic_uchar;
|
||||||
|
typedef short atomic_short;
|
||||||
|
typedef unsigned short atomic_ushort;
|
||||||
|
typedef int atomic_int;
|
||||||
|
typedef unsigned int atomic_uint;
|
||||||
|
typedef long atomic_long;
|
||||||
|
typedef unsigned long atomic_ulong;
|
||||||
|
typedef long long atomic_llong;
|
||||||
|
typedef unsigned long long atomic_ullong;
|
||||||
|
typedef wchar_t atomic_wchar_t;
|
||||||
|
typedef int_least8_t atomic_int_least8_t;
|
||||||
|
typedef uint_least8_t atomic_uint_least8_t;
|
||||||
|
typedef int_least16_t atomic_int_least16_t;
|
||||||
|
typedef uint_least16_t atomic_uint_least16_t;
|
||||||
|
typedef int_least32_t atomic_int_least32_t;
|
||||||
|
typedef uint_least32_t atomic_uint_least32_t;
|
||||||
|
typedef int_least64_t atomic_int_least64_t;
|
||||||
|
typedef uint_least64_t atomic_uint_least64_t;
|
||||||
|
typedef int_fast8_t atomic_int_fast8_t;
|
||||||
|
typedef uint_fast8_t atomic_uint_fast8_t;
|
||||||
|
typedef int_fast16_t atomic_int_fast16_t;
|
||||||
|
typedef uint_fast16_t atomic_uint_fast16_t;
|
||||||
|
typedef int_fast32_t atomic_int_fast32_t;
|
||||||
|
typedef uint_fast32_t atomic_uint_fast32_t;
|
||||||
|
typedef int_fast64_t atomic_int_fast64_t;
|
||||||
|
typedef uint_fast64_t atomic_uint_fast64_t;
|
||||||
|
typedef intptr_t atomic_intptr_t;
|
||||||
|
typedef uintptr_t atomic_uintptr_t;
|
||||||
|
typedef size_t atomic_size_t;
|
||||||
|
typedef ptrdiff_t atomic_ptrdiff_t;
|
||||||
|
typedef intmax_t atomic_intmax_t;
|
||||||
|
typedef uintmax_t atomic_uintmax_t;
|
||||||
|
|
||||||
|
#define atomic_store(object, desired) \
|
||||||
|
do { \
|
||||||
|
*(object) = (desired); \
|
||||||
|
__sync_synchronize(); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define atomic_store_explicit(object, desired, order) \
|
||||||
|
atomic_store(object, desired)
|
||||||
|
|
||||||
|
#define atomic_load(object) \
|
||||||
|
(__sync_synchronize(), *(object))
|
||||||
|
|
||||||
|
#define atomic_load_explicit(object, order) \
|
||||||
|
atomic_load(object)
|
||||||
|
|
||||||
|
#define atomic_exchange(object, desired) \
|
||||||
|
({ \
|
||||||
|
__typeof__(object) _obj = (object); \
|
||||||
|
__typeof__(*object) _old; \
|
||||||
|
do \
|
||||||
|
_old = atomic_load(_obj); \
|
||||||
|
while (!__sync_bool_compare_and_swap(_obj, _old, (desired))); \
|
||||||
|
_old; \
|
||||||
|
})
|
||||||
|
|
||||||
|
#define atomic_exchange_explicit(object, desired, order) \
|
||||||
|
atomic_exchange(object, desired)
|
||||||
|
|
||||||
|
#define atomic_compare_exchange_strong(object, expected, desired) \
|
||||||
|
({ \
|
||||||
|
__typeof__(object) _exp = (expected); \
|
||||||
|
__typeof__(*object) _old = *_exp; \
|
||||||
|
*_exp = __sync_val_compare_and_swap((object), _old, (desired)); \
|
||||||
|
*_exp == _old; \
|
||||||
|
})
|
||||||
|
|
||||||
|
#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
|
||||||
|
atomic_compare_exchange_strong(object, expected, desired)
|
||||||
|
|
||||||
|
#define atomic_compare_exchange_weak(object, expected, desired) \
|
||||||
|
atomic_compare_exchange_strong(object, expected, desired)
|
||||||
|
|
||||||
|
#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
|
||||||
|
atomic_compare_exchange_weak(object, expected, desired)
|
||||||
|
|
||||||
|
#define atomic_fetch_add(object, operand) \
|
||||||
|
__sync_fetch_and_add(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_add_explicit(object, operand, order) \
|
||||||
|
atomic_fetch_add(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_sub(object, operand) \
|
||||||
|
__sync_fetch_and_sub(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_sub_explicit(object, operand, order) \
|
||||||
|
atomic_fetch_sub(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_or(object, operand) \
|
||||||
|
__sync_fetch_and_or(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_or_explicit(object, operand, order) \
|
||||||
|
atomic_fetch_or(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_xor(object, operand) \
|
||||||
|
__sync_fetch_and_sub(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_xor_explicit(object, operand, order) \
|
||||||
|
atomic_fetch_sub(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_and(object, operand) \
|
||||||
|
__sync_fetch_and_and(object, operand)
|
||||||
|
|
||||||
|
#define atomic_fetch_and_explicit(object, operand, order) \
|
||||||
|
atomic_fetch_and(object, operand)
|
||||||
|
|
||||||
|
#define atomic_flag_test_and_set(object) \
|
||||||
|
atomic_exchange(object, 1)
|
||||||
|
|
||||||
|
#define atomic_flag_test_and_set_explicit(object, order) \
|
||||||
|
atomic_flag_test_and_set(object)
|
||||||
|
|
||||||
|
#define atomic_flag_clear(object) \
|
||||||
|
atomic_store(object, 0)
|
||||||
|
|
||||||
|
#define atomic_flag_clear_explicit(object, order) \
|
||||||
|
atomic_flag_clear(object)
|
||||||
|
|
||||||
|
#endif /* COMPAT_ATOMICS_GCC_STDATOMIC_H */
|
||||||
Loading…
Reference in new issue