| Index: third_party/grpc/src/core/client_config/initial_connect_string.h
|
| diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp b/third_party/grpc/src/core/client_config/initial_connect_string.h
|
| similarity index 64%
|
| copy from third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp
|
| copy to third_party/grpc/src/core/client_config/initial_connect_string.h
|
| index dba8160fdbcb0dd88bae2cd9ea8cf2a103dba336..b6dca7134a4345cc0c0989abe56f88c72442d7d3 100644
|
| --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp
|
| +++ b/third_party/grpc/src/core/client_config/initial_connect_string.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,33 +28,23 @@
|
| * 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 "core/animation/animatable/AnimatableValue.h"
|
| -
|
| -#include "core/animation/animatable/AnimatableNeutral.h"
|
| -#include "wtf/StdLibExtras.h"
|
| -#include <algorithm>
|
| -
|
| -namespace blink {
|
| -
|
| -PassRefPtr<AnimatableValue> AnimatableValue::neutralValue()
|
| -{
|
| - DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, (AnimatableNeutral::create()));
|
| - return neutralSentinelValue;
|
| -}
|
| +#ifndef GRPC_INTERNAL_CORE_CLIENT_CONFIG_INITIAL_CONNECT_STRING_H
|
| +#define GRPC_INTERNAL_CORE_CLIENT_CONFIG_INITIAL_CONNECT_STRING_H
|
|
|
| -PassRefPtr<AnimatableValue> AnimatableValue::interpolate(const AnimatableValue* left, const AnimatableValue* right, double fraction)
|
| -{
|
| - ASSERT(left);
|
| - ASSERT(right);
|
| - ASSERT(!left->isNeutral());
|
| - ASSERT(!right->isNeutral());
|
| +#include <grpc/support/slice.h>
|
| +#include "src/core/iomgr/sockaddr.h"
|
|
|
| - if (fraction && fraction != 1 && left->isSameType(right))
|
| - return left->interpolateTo(right, fraction);
|
| +typedef void (*grpc_set_initial_connect_string_func)(struct sockaddr **addr,
|
| + size_t *addr_len,
|
| + gpr_slice *initial_str);
|
| +void grpc_test_set_initial_connect_string_function(
|
| + grpc_set_initial_connect_string_func func);
|
|
|
| - return defaultInterpolateTo(left, right, fraction);
|
| -}
|
| +/** Set a string to be sent once connected. Optionally reset addr. */
|
| +void grpc_set_initial_connect_string(struct sockaddr **addr, size_t *addr_len,
|
| + gpr_slice *connect_string);
|
|
|
| -} // namespace blink
|
| +#endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_INITIAL_CONNECT_STRING_H */
|
|
|