| Index: third_party/grpc/include/grpc++/impl/codegen/config_protobuf.h
|
| diff --git a/third_party/WebKit/Source/core/animation/DocumentAnimations.h b/third_party/grpc/include/grpc++/impl/codegen/config_protobuf.h
|
| similarity index 56%
|
| copy from third_party/WebKit/Source/core/animation/DocumentAnimations.h
|
| copy to third_party/grpc/include/grpc++/impl/codegen/config_protobuf.h
|
| index d1fd95f0715fe61024eb0f995e20a40c2b2942e2..3b9f05cdff5b48241cd678fb461bd4617a5c34b9 100644
|
| --- a/third_party/WebKit/Source/core/animation/DocumentAnimations.h
|
| +++ b/third_party/grpc/include/grpc++/impl/codegen/config_protobuf.h
|
| @@ -1,5 +1,7 @@
|
| /*
|
| - * Copyright (C) 2013 Google Inc. All rights reserved.
|
| + *
|
| + * Copyright 2015-2016, 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,29 +28,45 @@
|
| * 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.
|
| + *
|
| */
|
|
|
| -#ifndef DocumentAnimations_h
|
| -#define DocumentAnimations_h
|
| +#ifndef GRPCXX_IMPL_CODEGEN_CONFIG_PROTOBUF_H
|
| +#define GRPCXX_IMPL_CODEGEN_CONFIG_PROTOBUF_H
|
|
|
| -#include "core/CSSPropertyNames.h"
|
| +#ifndef GRPC_CUSTOM_PROTOBUF_INT64
|
| +#include <google/protobuf/stubs/common.h>
|
| +#define GRPC_CUSTOM_PROTOBUF_INT64 ::google::protobuf::int64
|
| +#endif
|
|
|
| -namespace blink {
|
| +#ifndef GRPC_CUSTOM_MESSAGE
|
| +#include <google/protobuf/message.h>
|
| +#define GRPC_CUSTOM_MESSAGE ::google::protobuf::Message
|
| +#endif
|
|
|
| -class Document;
|
| -class Node;
|
| +#ifndef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM
|
| +#include <google/protobuf/io/coded_stream.h>
|
| +#include <google/protobuf/io/zero_copy_stream.h>
|
| +#define GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM \
|
| + ::google::protobuf::io::ZeroCopyOutputStream
|
| +#define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM \
|
| + ::google::protobuf::io::ZeroCopyInputStream
|
| +#define GRPC_CUSTOM_CODEDINPUTSTREAM ::google::protobuf::io::CodedInputStream
|
| +#endif
|
|
|
| -class DocumentAnimations {
|
| -public:
|
| - static void updateAnimationTimingForAnimationFrame(Document&);
|
| - static bool needsAnimationTimingUpdate(const Document&);
|
| - static void updateAnimationTimingIfNeeded(Document&);
|
| - static void updateCompositorAnimations(Document&);
|
| +namespace grpc {
|
| +namespace protobuf {
|
|
|
| -private:
|
| - DocumentAnimations() { }
|
| -};
|
| +typedef GRPC_CUSTOM_MESSAGE Message;
|
| +typedef GRPC_CUSTOM_PROTOBUF_INT64 int64;
|
|
|
| -} // namespace blink
|
| +namespace io {
|
| +typedef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM ZeroCopyOutputStream;
|
| +typedef GRPC_CUSTOM_ZEROCOPYINPUTSTREAM ZeroCopyInputStream;
|
| +typedef GRPC_CUSTOM_CODEDINPUTSTREAM CodedInputStream;
|
| +} // namespace io
|
|
|
| -#endif
|
| +} // namespace protobuf
|
| +} // namespace grpc
|
| +
|
| +#endif // GRPCXX_IMPL_CODEGEN_CONFIG_PROTOBUF_H
|
|
|