Implement BodyStreamBuffer::create() from WebDataConsumerHandle

Source/modules/fetch/BodyStreamBuffer.cpp

 // Copyright 2014 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 "config.h"
 #include "modules/fetch/BodyStreamBuffer.h"
 
 #include "core/dom/DOMArrayBuffer.h"
+#include "core/dom/ExceptionCode.h"
 
 namespace blink {
 
 namespace {
 
 class BlobCreator final : public BodyStreamBuffer::Observer {
 public:
     BlobCreator(BodyStreamBuffer* buffer, const String& contentType, BodyStreamBuffer::BlobHandleCreatorClient* client)
         : m_buffer(buffer)
         , m_client(client)
@@ skipping 108 matching lines @@
         m_inBuffer->unregisterObserver();
         m_inBuffer.clear();
         m_outBuffer1.clear();
         m_outBuffer2.clear();
     }
     Member<BodyStreamBuffer> m_inBuffer;
     Member<BodyStreamBuffer> m_outBuffer1;
     Member<BodyStreamBuffer> m_outBuffer2;
 };
 
+// WebDataConsumerHandleAdapter is used to migrate incrementally
+// from BodyStreamBuffer to FetchDataConsumerHandle and will be removed
+// after the migration.
+class WebDataConsumerHandleAdapter
+    : public GarbageCollectedFinalized<WebDataConsumerHandleAdapter>
+    , public WebDataConsumerHandle::Client {
+public:
+    WebDataConsumerHandleAdapter(PassOwnPtr<WebDataConsumerHandle> handle, const String& failureMessage)
+        : m_reader(handle->obtainReader(this))
+        , m_failureMessage(failureMessage)
+        , m_outputBuffer(new BodyStreamBuffer(new Canceller(this)))
+    {
+        ASSERT(m_reader);
+    }
+
+    ~WebDataConsumerHandleAdapter() override { }

[yhirano, 2015/06/17 01:34:02]

Do we need an empty destructor?

[hiroshige, 2015/06/17 07:21:28]

Done.

+
+    BodyStreamBuffer* outputBuffer() { return m_outputBuffer; }
+
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_outputBuffer);
+    }
+
+private:
+    class Canceller : public BodyStreamBuffer::Canceller {
+    public:
+        Canceller(WebDataConsumerHandleAdapter* source) : m_source(source) { }

[yhirano, 2015/06/17 01:34:03]

explicit

[hiroshige, 2015/06/17 07:21:28]

Done.

+
+        void cancel() override
+        {
+            m_source->close();
+        }
+
+        DEFINE_INLINE_VIRTUAL_TRACE()
+        {
+            BodyStreamBuffer::Canceller::trace(visitor);
+            visitor->trace(m_source);
+        }
+
+    private:
+        Member<WebDataConsumerHandleAdapter> m_source;
+    };
+
+    void didGetReadable() override
+    {
+        while (true) {
+            const void* buffer;
+            size_t available;
+            WebDataConsumerHandle::Result result = m_reader->beginRead(&buffer, WebDataConsumerHandle::FlagNone, &available);
+            switch (result) {
+            case WebDataConsumerHandle::Ok:
+                m_outputBuffer->write(DOMArrayBuffer::create(buffer, available));
+                m_reader->endRead(available);
+                break;
+
+            case WebDataConsumerHandle::Done:
+                close();
+                return;
+
+            case WebDataConsumerHandle::ShouldWait:
+                return;
+
+            case WebDataConsumerHandle::Busy:
+            case WebDataConsumerHandle::ResourceExhausted:
+            case WebDataConsumerHandle::UnexpectedError:
+                error();
+                return;
+            }
+        }
+    }
+
+    void error()
+    {
+        m_reader.clear();
+        m_outputBuffer->error(DOMException::create(NetworkError, m_failureMessage));
+        m_outputBuffer.clear();
+    }
+
+    void close()
+    {
+        m_reader.clear();
+        m_outputBuffer->close();
+        m_outputBuffer.clear();
+    }
+
+    OwnPtr<WebDataConsumerHandle::Reader> m_reader;
+    String m_failureMessage;
+
+    Member<BodyStreamBuffer> m_outputBuffer;
+};
+
+
 } // namespace
 
 PassRefPtr<DOMArrayBuffer> BodyStreamBuffer::read()
 {
     if (m_queue.isEmpty())
         return PassRefPtr<DOMArrayBuffer>();
     return m_queue.takeFirst();
 }
 
 void BodyStreamBuffer::write(PassRefPtr<DOMArrayBuffer> chunk)
@@ skipping 64 matching lines @@
     visitor->trace(m_canceller);
 }
 
 BodyStreamBuffer::BodyStreamBuffer(Canceller* canceller)
     : m_isClosed(false)
     , m_canceller(canceller)
 {
 }
 
 } // namespace blink