| Index: third_party/WebKit/Source/bindings/core/v8/V8BindingTest.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/V8BindingTest.cpp b/third_party/WebKit/Source/bindings/core/v8/V8BindingTest.cpp
|
| index a8ad6ea50bf308d0cd074862198e53973475e866..c48a43c806c9484de4243beb77b321a688895eff 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/V8BindingTest.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8BindingTest.cpp
|
| @@ -15,8 +15,8 @@ namespace blink {
|
| namespace {
|
|
|
| template <typename T>
|
| -v8::Local<v8::Value> toV8(V8TestingScope* scope, T value) {
|
| - return blink::toV8(value, scope->context()->Global(), scope->isolate());
|
| +v8::Local<v8::Value> ToV8(V8TestingScope* scope, T value) {
|
| + return blink::ToV8(value, scope->context()->Global(), scope->isolate());
|
| }
|
|
|
| TEST(V8BindingTest, toImplSequence) {
|
| @@ -24,10 +24,10 @@ TEST(V8BindingTest, toImplSequence) {
|
| {
|
| v8::Local<v8::Array> v8StringArray = v8::Array::New(scope.isolate(), 2);
|
| v8StringArray
|
| - ->Set(scope.context(), toV8(&scope, 0), toV8(&scope, "Hello, World!"))
|
| + ->Set(scope.context(), ToV8(&scope, 0), ToV8(&scope, "Hello, World!"))
|
| .ToChecked();
|
| v8StringArray
|
| - ->Set(scope.context(), toV8(&scope, 1), toV8(&scope, "Hi, Mom!"))
|
| + ->Set(scope.context(), ToV8(&scope, 1), ToV8(&scope, "Hi, Mom!"))
|
| .ToChecked();
|
|
|
| NonThrowableExceptionState exceptionState;
|
| @@ -44,9 +44,9 @@ TEST(V8BindingTest, toImplArray) {
|
| {
|
| v8::Local<v8::Array> v8StringArray = v8::Array::New(scope.isolate(), 2);
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray->Set(
|
| - scope.context(), toV8(&scope, 0), toV8(&scope, "Hello, World!"))));
|
| + scope.context(), ToV8(&scope, 0), ToV8(&scope, "Hello, World!"))));
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray->Set(
|
| - scope.context(), toV8(&scope, 1), toV8(&scope, "Hi, Mom!"))));
|
| + scope.context(), ToV8(&scope, 1), ToV8(&scope, "Hi, Mom!"))));
|
|
|
| NonThrowableExceptionState exceptionState;
|
| Vector<String> stringVector = toImplArray<Vector<String>>(
|
| @@ -58,11 +58,11 @@ TEST(V8BindingTest, toImplArray) {
|
| {
|
| v8::Local<v8::Array> v8UnsignedArray = v8::Array::New(scope.isolate(), 3);
|
| EXPECT_TRUE(v8CallBoolean(v8UnsignedArray->Set(
|
| - scope.context(), toV8(&scope, 0), toV8(&scope, 42))));
|
| + scope.context(), ToV8(&scope, 0), ToV8(&scope, 42))));
|
| EXPECT_TRUE(v8CallBoolean(v8UnsignedArray->Set(
|
| - scope.context(), toV8(&scope, 1), toV8(&scope, 1729))));
|
| + scope.context(), ToV8(&scope, 1), ToV8(&scope, 1729))));
|
| EXPECT_TRUE(v8CallBoolean(v8UnsignedArray->Set(
|
| - scope.context(), toV8(&scope, 2), toV8(&scope, 31773))));
|
| + scope.context(), ToV8(&scope, 2), ToV8(&scope, 31773))));
|
|
|
| NonThrowableExceptionState exceptionState;
|
| Vector<unsigned> unsignedVector = toImplArray<Vector<unsigned>>(
|
| @@ -76,8 +76,8 @@ TEST(V8BindingTest, toImplArray) {
|
| const double doublePi = 3.141592653589793238;
|
| const float floatPi = doublePi;
|
| v8::Local<v8::Array> v8RealArray = v8::Array::New(scope.isolate(), 1);
|
| - EXPECT_TRUE(v8CallBoolean(v8RealArray->Set(scope.context(), toV8(&scope, 0),
|
| - toV8(&scope, doublePi))));
|
| + EXPECT_TRUE(v8CallBoolean(v8RealArray->Set(scope.context(), ToV8(&scope, 0),
|
| + ToV8(&scope, doublePi))));
|
|
|
| NonThrowableExceptionState exceptionState;
|
| Vector<double> doubleVector = toImplArray<Vector<double>>(
|
| @@ -92,12 +92,12 @@ TEST(V8BindingTest, toImplArray) {
|
| }
|
| {
|
| v8::Local<v8::Array> v8Array = v8::Array::New(scope.isolate(), 3);
|
| - EXPECT_TRUE(v8CallBoolean(v8Array->Set(scope.context(), toV8(&scope, 0),
|
| - toV8(&scope, "Vini, vidi, vici."))));
|
| + EXPECT_TRUE(v8CallBoolean(v8Array->Set(scope.context(), ToV8(&scope, 0),
|
| + ToV8(&scope, "Vini, vidi, vici."))));
|
| EXPECT_TRUE(v8CallBoolean(
|
| - v8Array->Set(scope.context(), toV8(&scope, 1), toV8(&scope, 65535))));
|
| + v8Array->Set(scope.context(), ToV8(&scope, 1), ToV8(&scope, 65535))));
|
| EXPECT_TRUE(v8CallBoolean(
|
| - v8Array->Set(scope.context(), toV8(&scope, 2), toV8(&scope, 0.125))));
|
| + v8Array->Set(scope.context(), ToV8(&scope, 2), ToV8(&scope, 0.125))));
|
|
|
| NonThrowableExceptionState exceptionState;
|
| Vector<v8::Local<v8::Value>> v8HandleVector =
|
| @@ -121,22 +121,22 @@ TEST(V8BindingTest, toImplArray) {
|
| {
|
| v8::Local<v8::Array> v8StringArray1 = v8::Array::New(scope.isolate(), 2);
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray1->Set(
|
| - scope.context(), toV8(&scope, 0), toV8(&scope, "foo"))));
|
| + scope.context(), ToV8(&scope, 0), ToV8(&scope, "foo"))));
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray1->Set(
|
| - scope.context(), toV8(&scope, 1), toV8(&scope, "bar"))));
|
| + scope.context(), ToV8(&scope, 1), ToV8(&scope, "bar"))));
|
| v8::Local<v8::Array> v8StringArray2 = v8::Array::New(scope.isolate(), 3);
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray2->Set(
|
| - scope.context(), toV8(&scope, 0), toV8(&scope, "x"))));
|
| + scope.context(), ToV8(&scope, 0), ToV8(&scope, "x"))));
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray2->Set(
|
| - scope.context(), toV8(&scope, 1), toV8(&scope, "y"))));
|
| + scope.context(), ToV8(&scope, 1), ToV8(&scope, "y"))));
|
| EXPECT_TRUE(v8CallBoolean(v8StringArray2->Set(
|
| - scope.context(), toV8(&scope, 2), toV8(&scope, "z"))));
|
| + scope.context(), ToV8(&scope, 2), ToV8(&scope, "z"))));
|
| v8::Local<v8::Array> v8StringArrayArray =
|
| v8::Array::New(scope.isolate(), 2);
|
| EXPECT_TRUE(v8CallBoolean(v8StringArrayArray->Set(
|
| - scope.context(), toV8(&scope, 0), v8StringArray1)));
|
| + scope.context(), ToV8(&scope, 0), v8StringArray1)));
|
| EXPECT_TRUE(v8CallBoolean(v8StringArrayArray->Set(
|
| - scope.context(), toV8(&scope, 1), v8StringArray2)));
|
| + scope.context(), ToV8(&scope, 1), v8StringArray2)));
|
|
|
| NonThrowableExceptionState exceptionState;
|
| Vector<Vector<String>> stringVectorVector =
|
|
|