Commit b3f88d2e authored by Renjie Tang's avatar Renjie Tang Committed by Commit Bot

Roll src/net/third_party/quiche/src/ 28315b77c..45f8f8610 (2 commits)

https://quiche.googlesource.com/quiche.git/+log/28315b77c94c..45f8f861073d

$ git log 28315b77c..45f8f8610 --date=short --no-merges --format='%ad %ae %s'
2019-08-30 bnc Make QuicSendControlStream send actual value for SETTINGS_QPACK_MAX_TABLE_CAPACITY.
2019-08-30 rch gfe-relnote: use QUIC_foo instead of ABSL_foo for mutex annotations in QUIC. Not flag protected. No behavior change.

Created with:
  roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src

Change-Id: I4c06014396d2e8fb6bc02d8c82ff57ed25ec1e25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1779528Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692337}
parent 008738a4
...@@ -301,7 +301,7 @@ vars = { ...@@ -301,7 +301,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'quiche_revision': '28315b77c94c06e419bc8e6cddedce71884cbf4d', 'quiche_revision': '45f8f861073d321294d735c077b67fddb5ba2cee',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit # the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#endif #endif
#define QUIC_PREDICT_FALSE_IMPL(x) x #define QUIC_PREDICT_FALSE_IMPL(x) x
#define QUIC_PREDICT_TRUE_IMPL(x) x
#define QUIC_NOTREACHED_IMPL() NOTREACHED() #define QUIC_NOTREACHED_IMPL() NOTREACHED()
......
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
#define QUIC_EXCLUSIVE_LOCKS_REQUIRED_IMPL EXCLUSIVE_LOCKS_REQUIRED
#define QUIC_GUARDED_BY_IMPL GUARDED_BY
#define QUIC_LOCKABLE_IMPL LOCKABLE
#define QUIC_LOCKS_EXCLUDED_IMPL LOCKS_EXCLUDED
#define QUIC_SHARED_LOCKS_REQUIRED_IMPL SHARED_LOCKS_REQUIRED
#define QUIC_EXCLUSIVE_LOCK_FUNCTION_IMPL EXCLUSIVE_LOCK_FUNCTION
#define QUIC_UNLOCK_FUNCTION_IMPL UNLOCK_FUNCTION
#define QUIC_SHARED_LOCK_FUNCTION_IMPL SHARED_LOCK_FUNCTION
#define QUIC_SCOPED_LOCKABLE_IMPL SCOPED_LOCKABLE
#define QUIC_ASSERT_SHARED_LOCK_IMPL ASSERT_SHARED_LOCK
#ifndef EXCLUSIVE_LOCK_FUNCTION #ifndef EXCLUSIVE_LOCK_FUNCTION
#define EXCLUSIVE_LOCK_FUNCTION(...) #define EXCLUSIVE_LOCK_FUNCTION(...)
#endif #endif
...@@ -49,7 +60,7 @@ ...@@ -49,7 +60,7 @@
namespace quic { namespace quic {
// A class wrapping a non-reentrant mutex. // A class wrapping a non-reentrant mutex.
class LOCKABLE QUIC_EXPORT_PRIVATE QuicLockImpl { class QUIC_LOCKABLE_IMPL QUIC_EXPORT_PRIVATE QuicLockImpl {
public: public:
QuicLockImpl() = default; QuicLockImpl() = default;
......
...@@ -182,7 +182,7 @@ QUIC_FLAG(bool, ...@@ -182,7 +182,7 @@ QUIC_FLAG(bool,
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_47, false) QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_47, false)
// If true, enable QUIC version 48. // If true, enable QUIC version 48.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_48_2, false) QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_48_2, true)
// If true, disable QUIC version 39. // If true, disable QUIC version 39.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_39, false) QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_39, false)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment