| Index: third_party/grpc/src/core/transport/chttp2/alpn.h
|
| diff --git a/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp b/third_party/grpc/src/core/transport/chttp2/alpn.h
|
| similarity index 71%
|
| copy from third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp
|
| copy to third_party/grpc/src/core/transport/chttp2/alpn.h
|
| index 6fdbd546253457791142299432f06f95a5472687..f38b4c3167e0ededf9c4353e4eaf34cfc92af916 100644
|
| --- a/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp
|
| +++ b/third_party/grpc/src/core/transport/chttp2/alpn.h
|
| @@ -1,5 +1,7 @@
|
| /*
|
| - * Copyright (C) 2013 Google Inc. All rights reserved.
|
| + *
|
| + * Copyright 2015, Google Inc.
|
| + * All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| @@ -26,21 +28,22 @@
|
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + *
|
| */
|
|
|
| -#include "public/platform/modules/device_orientation/WebDeviceMotionData.h"
|
| +#ifndef GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_ALPN_H
|
| +#define GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_ALPN_H
|
|
|
| #include <string.h>
|
|
|
| -namespace blink {
|
| +/* Retuns 1 if the version is supported, 0 otherwise. */
|
| +int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size);
|
| +
|
| +/* Returns the number of protocol versions to advertise */
|
| +size_t grpc_chttp2_num_alpn_versions(void);
|
|
|
| -WebDeviceMotionData::WebDeviceMotionData()
|
| -{
|
| - // Make sure to zero out the memory so that there are no uninitialized bits.
|
| - // This object is used in the shared memory buffer and is memory copied by
|
| - // two processes. Valgrind will complain if we copy around memory that is
|
| - // only partially initialized.
|
| - memset(this, 0, sizeof(*this));
|
| -}
|
| +/* Returns the protocol version at index i (0 <= i <
|
| + * grpc_chttp2_num_alpn_versions()) */
|
| +const char *grpc_chttp2_get_alpn_version_index(size_t i);
|
|
|
| -} // namespace blink
|
| +#endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_ALPN_H */
|
|
|