Make ReadableStreamOperations use ScriptValue

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 1da536487d3fdd1f01361a65e645421640935cec..36590becef6a1678e29cdf02e7882008aaee6b30 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
@@ -10,57 +10,61 @@
 
 namespace blink {
 
-ScriptValue ReadableStreamOperations::getReader(ScriptState* scriptState, v8::Local<v8::Value> stream, ExceptionState& es)
+ScriptValue ReadableStreamOperations::getReader(ScriptState* scriptState, ScriptValue stream, ExceptionState& es)
 {
     ASSERT(isReadableStream(scriptState, stream));
 
     v8::TryCatch block(scriptState->isolate());
-    v8::Local<v8::Value> args[] = { stream };
+    v8::Local<v8::Value> args[] = { stream.v8Value() };
     ScriptValue result(scriptState, v8CallExtra(scriptState, "AcquireReadableStreamReader", args));
     if (block.HasCaught())
         es.rethrowV8Exception(block.Exception());
     return result;
 }
 
-bool ReadableStreamOperations::isReadableStream(ScriptState* scriptState, v8::Local<v8::Value> value)
+bool ReadableStreamOperations::isReadableStream(ScriptState* scriptState, ScriptValue value)
 {
-    if (!value->IsObject())
+    ASSERT(!value.isEmpty());
+
+    if (!value.isObject())
         return false;
 
-    v8::Local<v8::Value> args[] = { value };
+    v8::Local<v8::Value> args[] = { value.v8Value() };
     return v8CallExtraOrCrash(scriptState, "IsReadableStream", args)->ToBoolean()->Value();
 }
 
-bool ReadableStreamOperations::isDisturbed(ScriptState* scriptState, v8::Local<v8::Value> stream)
+bool ReadableStreamOperations::isDisturbed(ScriptState* scriptState, ScriptValue stream)
 {
     ASSERT(isReadableStream(scriptState, stream));
 
-    v8::Local<v8::Value> args[] = { stream };
+    v8::Local<v8::Value> args[] = { stream.v8Value() };
     return v8CallExtraOrCrash(scriptState, "IsReadableStreamDisturbed", args)->ToBoolean()->Value();
 }
 
-bool ReadableStreamOperations::isLocked(ScriptState* scriptState, v8::Local<v8::Value> stream)
+bool ReadableStreamOperations::isLocked(ScriptState* scriptState, ScriptValue stream)
 {
     ASSERT(isReadableStream(scriptState, stream));
 
-    v8::Local<v8::Value> args[] = { stream };
+    v8::Local<v8::Value> args[] = { stream.v8Value() };
     return v8CallExtraOrCrash(scriptState, "IsReadableStreamLocked", args)->ToBoolean()->Value();
 }
 
-bool ReadableStreamOperations::isReadableStreamReader(ScriptState* scriptState, v8::Local<v8::Value> value)
+bool ReadableStreamOperations::isReadableStreamReader(ScriptState* scriptState, ScriptValue value)
 {
-    if (!value->IsObject())
+    ASSERT(!value.isEmpty());
+
+    if (!value.isObject())
         return false;
 
-    v8::Local<v8::Value> args[] = { value };
+    v8::Local<v8::Value> args[] = { value.v8Value() };
     return v8CallExtraOrCrash(scriptState, "IsReadableStreamReader", args)->ToBoolean()->Value();
 }
 
-ScriptPromise ReadableStreamOperations::read(ScriptState* scriptState, v8::Local<v8::Value> reader)
+ScriptPromise ReadableStreamOperations::read(ScriptState* scriptState, ScriptValue reader)
 {
     ASSERT(isReadableStreamReader(scriptState, reader));
 
-    v8::Local<v8::Value> args[] = { reader };
+    v8::Local<v8::Value> args[] = { reader.v8Value() };
     return ScriptPromise::cast(scriptState, v8CallExtraOrCrash(scriptState, "ReadFromReadableStreamReader", args));
 }