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

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp

Issue 2780693003: [wasm] response-based compile APIs (Closed)
Patch Set: . Created 3 years, 9 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/modules/fetch/FetchDataLoader.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
index e5b6ce557785ad9816bf866ffd45be9bc671477d..b3e8baeefa664597e9085a7f43097d4105bf8208 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
@@ -21,8 +21,7 @@ class FetchDataLoaderAsBlobHandle final : public FetchDataLoader,
USING_GARBAGE_COLLECTED_MIXIN(FetchDataLoaderAsBlobHandle);
public:
- explicit FetchDataLoaderAsBlobHandle(const String& mimeType)
- : m_mimeType(mimeType) {}
+ FetchDataLoaderAsBlobHandle(const String& mimeType) : m_mimeType(mimeType) {}
void start(BytesConsumer* consumer,
FetchDataLoader::Client* client) override {
@@ -305,6 +304,101 @@ class FetchDataLoaderAsStream final : public FetchDataLoader,
Member<Stream> m_outStream;
};
+class FetchDataLoaderAsWasmModule final : public FetchDataLoader,
+ public BytesConsumer::Client {
+ USING_GARBAGE_COLLECTED_MIXIN(FetchDataLoaderAsWasmModule);
+
+ public:
+ explicit FetchDataLoaderAsWasmModule(v8::Isolate* isolate,
+ ScriptPromiseResolver* resolver,
+ ScriptState* scriptState)
haraken 2017/04/04 06:05:31 Drop explicit.
+ : m_resolver(resolver), m_builder(isolate), m_scriptState(scriptState) {}
+
+ void start(BytesConsumer* consumer,
+ FetchDataLoader::Client* client) override {
+ DCHECK(!m_consumer);
+ DCHECK(!m_client);
+ m_client = client;
+ m_consumer = consumer;
+ m_consumer->setClient(this);
+ onStateChange();
+ }
+
+ void onStateChange() override {
+ while (true) {
+ const char* buffer;
+ size_t available;
+ BytesConsumer::Result result = m_consumer->beginRead(&buffer, &available);
+
+ switch (result) {
+ case BytesConsumer::Result::ShouldWait:
+ return;
+ case BytesConsumer::Result::Ok: {
+ sendBytes(buffer, available);
+ result = m_consumer->endRead(available);
+ if (result == BytesConsumer::Result::Error) {
+ m_resolver->reject();
+ }
+ break;
+ }
+ case BytesConsumer::Result::Done: {
+ DCHECK_EQ(available, 0U);
+ v8::Isolate* isolate = m_resolver->getScriptState()->isolate();
+ ScriptState::Scope scope(m_scriptState.get());
+ v8::TryCatch trycatch(isolate);
+ v8::Local<v8::WasmCompiledModule> module;
+ if (m_builder.Finish().ToLocal(&module)) {
+ DCHECK(!trycatch.HasCaught());
+ ScriptValue scriptValue(m_scriptState.get(), module);
+ m_resolver->resolve(scriptValue);
+ } else {
+ DCHECK(trycatch.HasCaught());
+ m_resolver->reject(trycatch.Exception());
+ trycatch.Reset();
+ }
+ m_client->didFetchDataLoadedStream();
+ return;
+ }
+ case BytesConsumer::Result::Error: {
+ // TODO(mtrofin): do we need an abort on the wasm side?
+ // m_outStream->abort();
+ m_client->didFetchDataLoadFailed();
+ return;
+ }
+ }
+ }
+ }
+
+ void cancel() override { m_consumer->cancel(); }
+
+ DEFINE_INLINE_TRACE() {
+ visitor->trace(m_consumer);
+ visitor->trace(m_resolver);
+ visitor->trace(m_client);
+ FetchDataLoader::trace(visitor);
+ BytesConsumer::Client::trace(visitor);
+ }
+
+ private:
+ void sendBytes(const char* bytes, size_t size) {
+ std::unique_ptr<uint8_t[]> bufferCopy(new uint8_t[size]);
haraken 2017/04/04 06:05:31 We should use fastMalloc / fastFree instead of new
Mircea Trofin 2017/04/04 06:48:07 Oh, good point - thats anyway what we want to do o
+ memcpy(bufferCopy.get(), bytes, size);
+ // TODO(mtrofin): we want to extend OnBytesReceived to test
+ // for decoding errors or for compilation errors that
+ // happened meanwhile.
+ m_builder.OnBytesReceived(
+ std::unique_ptr<const uint8_t[]>(
+ const_cast<const uint8_t*>(bufferCopy.release())),
+ size);
+ }
+
+ Member<BytesConsumer> m_consumer;
+ Member<ScriptPromiseResolver> m_resolver;
+ Member<FetchDataLoader::Client> m_client;
+ v8::WasmModuleObjectBuilder m_builder;
+ const RefPtr<ScriptState> m_scriptState;
+};
+
} // namespace
FetchDataLoader* FetchDataLoader::createLoaderAsBlobHandle(
@@ -324,4 +418,11 @@ FetchDataLoader* FetchDataLoader::createLoaderAsStream(Stream* outStream) {
return new FetchDataLoaderAsStream(outStream);
}
+FetchDataLoader* FetchDataLoader::createLoaderAsWasmModule(
+ v8::Isolate* isolate,
+ ScriptPromiseResolver* resolver,
+ ScriptState* scriptState) {
+ return new FetchDataLoaderAsWasmModule(isolate, resolver, scriptState);
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698