Make ReadableStreamOperations use ScriptValue

third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandle.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/ReadableStreamDataConsumerHandle.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ReadableStreamOperations.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 101 matching lines @@
 
         Result endRead(size_t readSize) override
         {
             return m_readingContext->endRead(readSize);
         }
 
     private:
         RefPtr<ReadingContext> m_readingContext;
     };
 
-    static PassRefPtr<ReadingContext> create(ScriptState* scriptState, v8::Local<v8::Value> stream)
+    static PassRefPtr<ReadingContext> create(ScriptState* scriptState, ScriptValue stream)
     {
         return adoptRef(new ReadingContext(scriptState, stream));
     }
 
     void attachReader(WebDataConsumerHandle::Client* client)
     {
         m_client = client;
         notifyLater();
     }
 
@@ skipping 16 matching lines @@
             *buffer = m_pendingBuffer->data() + m_pendingOffset;
             *available = m_pendingBuffer->length() - m_pendingOffset;
             return WebDataConsumerHandle::Ok;
         }
         ASSERT(!m_reader.isEmpty());
         m_isInRecursion = true;
         if (!m_isReading) {
             m_isReading = true;
             ScriptState::Scope scope(m_reader.scriptState());
             V8RecursionScope recursionScope(m_reader.isolate());
-            ReadableStreamOperations::read(m_reader.scriptState(), m_reader.v8Value()).then(
-                OnFulfilled::createFunction(m_reader.scriptState(), m_weakPtrFactory.createWeakPtr()),
-                OnRejected::createFunction(m_reader.scriptState(), m_weakPtrFactory.createWeakPtr()));
+            ReadableStreamOperations::read(m_reader.scriptState(), m_reader).then(OnFulfilled::createFunction(m_reader.scriptState(), m_weakPtrFactory.createWeakPtr()), OnRejected::createFunction(m_reader.scriptState(), m_weakPtrFactory.createWeakPtr()));
             // Note: Microtasks may run here.
         }
         m_isInRecursion = false;
         return WebDataConsumerHandle::ShouldWait;
     }
 
     Result endRead(size_t readSize)
     {
         ASSERT(m_pendingBuffer);
         ASSERT(m_pendingOffset + readSize <= m_pendingBuffer->length());
@@ skipping 47 matching lines @@
         m_client->didGetReadable();
     }
 
     void notifyLater()
     {
         ASSERT(m_client);
         Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&ReadingContext::notify, PassRefPtr<ReadingContext>(this)));
     }
 
 private:
-    ReadingContext(ScriptState* scriptState, v8::Local<v8::Value> stream)
+    ReadingContext(ScriptState* scriptState, ScriptValue stream)
         : m_client(nullptr)
         , m_weakPtrFactory(this)
         , m_pendingOffset(0)
         , m_isReading(false)
         , m_isDone(false)
         , m_hasError(false)
         , m_isInRecursion(false)
     {
         if (!ReadableStreamOperations::isLocked(scriptState, stream)) {
             // Here the stream implementation must not throw an exception.
@@ skipping 13 matching lines @@
     WebDataConsumerHandle::Client* m_client;
     RefPtr<DOMUint8Array> m_pendingBuffer;
     WeakPtrFactory<ReadingContext> m_weakPtrFactory;
     size_t m_pendingOffset;
     bool m_isReading;
     bool m_isDone;
     bool m_hasError;
     bool m_isInRecursion;
 };
 
-ReadableStreamDataConsumerHandle::ReadableStreamDataConsumerHandle(ScriptState* scriptState, v8::Local<v8::Value> stream)
+ReadableStreamDataConsumerHandle::ReadableStreamDataConsumerHandle(ScriptState* scriptState, ScriptValue stream)
     : m_readingContext(ReadingContext::create(scriptState, stream))
 {
 }
 ReadableStreamDataConsumerHandle::~ReadableStreamDataConsumerHandle() = default;
 
 FetchDataConsumerHandle::Reader* ReadableStreamDataConsumerHandle::obtainReaderInternal(Client* client)
 {
     return new ReadingContext::ReaderImpl(m_readingContext, client);
 }
 
 } // namespace blink