Move utilities for V8 extras functions into V8Binding.h

third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp

Index: third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp b/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
index 44044ac545e9f341fd0dc0365fe3d8329f5504cc..1da536487d3fdd1f01361a65e645421640935cec 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
@@ -6,38 +6,17 @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
-#include "bindings/core/v8/V8BindingMacros.h"
+#include "bindings/core/v8/V8Binding.h"
 
 namespace blink {
 
-namespace {
-
-v8::MaybeLocal<v8::Value> call(ScriptState* scriptState, const char* name, size_t numArgs, v8::Local<v8::Value>* args)
-{
-    v8::Isolate* isolate = scriptState->isolate();
-    v8::Local<v8::Context> context = scriptState->context();
-    v8::Local<v8::Value> undefined = v8::Undefined(isolate);
-    v8::Local<v8::Value> functionValue = scriptState->getFromExtrasExports(name).v8Value();
-    ASSERT(!functionValue.IsEmpty() && functionValue->IsFunction());
-    v8::Local<v8::Function> function = functionValue.As<v8::Function>();
-    return function->Call(context, undefined, numArgs, args);
-}
-
-template <size_t N>
-v8::MaybeLocal<v8::Value> call(ScriptState* scriptState, const char* name, v8::Local<v8::Value>(&args)[N])
-{
-    return call(scriptState, name, N, args);
-}
-
-} // namespace
-
 ScriptValue ReadableStreamOperations::getReader(ScriptState* scriptState, v8::Local<v8::Value> stream, ExceptionState& es)
 {
     ASSERT(isReadableStream(scriptState, stream));
 
     v8::TryCatch block(scriptState->isolate());
     v8::Local<v8::Value> args[] = { stream };
-    ScriptValue result(scriptState, call(scriptState, "AcquireReadableStreamReader", args));
+    ScriptValue result(scriptState, v8CallExtra(scriptState, "AcquireReadableStreamReader", args));
     if (block.HasCaught())
         es.rethrowV8Exception(block.Exception());
     return result;
@@ -49,7 +28,7 @@ bool ReadableStreamOperations::isReadableStream(ScriptState* scriptState, v8::Lo
         return false;
 
     v8::Local<v8::Value> args[] = { value };
-    return v8CallOrCrash(call(scriptState, "IsReadableStream", args))->ToBoolean()->Value();
+    return v8CallExtraOrCrash(scriptState, "IsReadableStream", args)->ToBoolean()->Value();
 }
 
 bool ReadableStreamOperations::isDisturbed(ScriptState* scriptState, v8::Local<v8::Value> stream)
@@ -57,7 +36,7 @@ bool ReadableStreamOperations::isDisturbed(ScriptState* scriptState, v8::Local<v
     ASSERT(isReadableStream(scriptState, stream));
 
     v8::Local<v8::Value> args[] = { stream };
-    return v8CallOrCrash(call(scriptState, "IsReadableStreamDisturbed", args))->ToBoolean()->Value();
+    return v8CallExtraOrCrash(scriptState, "IsReadableStreamDisturbed", args)->ToBoolean()->Value();
 }
 
 bool ReadableStreamOperations::isLocked(ScriptState* scriptState, v8::Local<v8::Value> stream)
@@ -65,7 +44,7 @@ bool ReadableStreamOperations::isLocked(ScriptState* scriptState, v8::Local<v8::
     ASSERT(isReadableStream(scriptState, stream));
 
     v8::Local<v8::Value> args[] = { stream };
-    return v8CallOrCrash(call(scriptState, "IsReadableStreamLocked", args))->ToBoolean()->Value();
+    return v8CallExtraOrCrash(scriptState, "IsReadableStreamLocked", args)->ToBoolean()->Value();
 }
 
 bool ReadableStreamOperations::isReadableStreamReader(ScriptState* scriptState, v8::Local<v8::Value> value)
@@ -74,7 +53,7 @@ bool ReadableStreamOperations::isReadableStreamReader(ScriptState* scriptState,
         return false;
 
     v8::Local<v8::Value> args[] = { value };
-    return v8CallOrCrash(call(scriptState, "IsReadableStreamReader", args))->ToBoolean()->Value();
+    return v8CallExtraOrCrash(scriptState, "IsReadableStreamReader", args)->ToBoolean()->Value();
 }
 
 ScriptPromise ReadableStreamOperations::read(ScriptState* scriptState, v8::Local<v8::Value> reader)
@@ -82,7 +61,7 @@ ScriptPromise ReadableStreamOperations::read(ScriptState* scriptState, v8::Local
     ASSERT(isReadableStreamReader(scriptState, reader));
 
     v8::Local<v8::Value> args[] = { reader };
-    return ScriptPromise::cast(scriptState, v8CallOrCrash(call(scriptState, "ReadFromReadableStreamReader", args)));
+    return ScriptPromise::cast(scriptState, v8CallExtraOrCrash(scriptState, "ReadFromReadableStreamReader", args));
 }
 
 } // namespace blink