Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp

Issue 1167343002: Add methods for creating V8 extras-based ReadableStreams from C++ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Don't modify UnderlyingSource.h, oops Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..6561502e2c823fdb506fa1143d3a0e62a2222884 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperations.cpp
@@ -6,83 +6,93 @@
#include "bindings/core/v8/ExceptionState.h"
#include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/ToV8.h"
#include "bindings/core/v8/V8BindingMacros.h"
+#include "bindings/core/v8/V8RecursionScope.h"
+#include "core/streams/UnderlyingSourceBase.h"
namespace blink {
-namespace {
-
-v8::MaybeLocal<v8::Value> call(ScriptState* scriptState, const char* name, size_t numArgs, v8::Local<v8::Value>* args)
+ScriptValue ReadableStreamOperations::createReadableStream(ScriptState* scriptState, UnderlyingSourceBase* underlyingSource, ScriptValue strategy)
{
- v8::Isolate* isolate = scriptState->isolate();
+ ScriptState::Scope scope(scriptState);
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);
+ v8::Local<v8::Object> global = context->Global();
+ v8::Isolate* isolate = scriptState->isolate();
+
+ v8::Local<v8::Value> jsUnderlyingSource = toV8(underlyingSource, global, isolate);
+ v8::Local<v8::Value> jsStrategy = strategy.v8Value();
+
+ V8RecursionScope::MicrotaskSuppression mtsScope(isolate);
+ v8::Local<v8::Value> args[] = { jsUnderlyingSource, jsStrategy };
+ v8::Local<v8::Value> jsStream = v8CallExtraOrCrash(scriptState, "createReadableStreamWithExternalController", args);
+
+ return ScriptValue(scriptState, jsStream);
}
-template <size_t N>
-v8::MaybeLocal<v8::Value> call(ScriptState* scriptState, const char* name, v8::Local<v8::Value>(&args)[N])
+ScriptValue ReadableStreamOperations::createCountQueuingStrategy(ScriptState* scriptState, size_t highWaterMark)
{
- return call(scriptState, name, N, args);
-}
+ ScriptState::Scope scope(scriptState);
+ v8::Isolate* isolate = scriptState->isolate();
-} // namespace
+ v8::Local<v8::Value> args[] = { v8::Number::New(isolate, highWaterMark) };
+ v8::Local<v8::Value> jsStrategy = v8CallExtraOrCrash(scriptState, "createBuiltInCountQueuingStrategy", args);
+
+ return ScriptValue(scriptState, jsStrategy);
+}
-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 };
- ScriptValue result(scriptState, call(scriptState, "AcquireReadableStreamReader", args));
+ 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())
+ if (!value.isObject())
return false;
- v8::Local<v8::Value> args[] = { value };
- return v8CallOrCrash(call(scriptState, "IsReadableStream", args))->ToBoolean()->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 };
- return v8CallOrCrash(call(scriptState, "IsReadableStreamDisturbed", args))->ToBoolean()->Value();
+ 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 };
- return v8CallOrCrash(call(scriptState, "IsReadableStreamLocked", args))->ToBoolean()->Value();
+ 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())
+ if (!value.isObject())
return false;
- v8::Local<v8::Value> args[] = { value };
- return v8CallOrCrash(call(scriptState, "IsReadableStreamReader", args))->ToBoolean()->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 };
- return ScriptPromise::cast(scriptState, v8CallOrCrash(call(scriptState, "ReadFromReadableStreamReader", args)));
+ v8::Local<v8::Value> args[] = { reader.v8Value() };
+ return ScriptPromise::cast(scriptState, v8CallExtraOrCrash(scriptState, "ReadFromReadableStreamReader", args));
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698