Index: third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp |
diff --git a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp |
index a6dafcc0e2ec16a3a1002e5d6bd37c09d43d4c1e..960db80f73a776f82e8320aa0765f23b4c579078 100644 |
--- a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp |
+++ b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp |
@@ -4,12 +4,6 @@ |
#include "modules/fetch/DataConsumerHandleUtil.h" |
-#include "platform/blob/BlobData.h" |
-#include "public/platform/Platform.h" |
-#include "public/platform/WebTaskRunner.h" |
-#include "public/platform/WebThread.h" |
-#include "public/platform/WebTraceLocation.h" |
-#include "wtf/Functional.h" |
#include "wtf/PtrUtil.h" |
#include <memory> |
@@ -39,43 +33,6 @@ class WaitingHandle final : public WebDataConsumerHandle { |
const char* debugName() const override { return "WaitingHandle"; } |
}; |
-class RepeatingReader final : public WebDataConsumerHandle::Reader { |
- public: |
- explicit RepeatingReader(Result result, WebDataConsumerHandle::Client* client) |
- : m_result(result), m_notifier(client) {} |
- |
- private: |
- Result beginRead(const void** buffer, |
- WebDataConsumerHandle::Flags, |
- size_t* available) override { |
- *available = 0; |
- *buffer = nullptr; |
- return m_result; |
- } |
- Result endRead(size_t) override { |
- return WebDataConsumerHandle::UnexpectedError; |
- } |
- |
- Result m_result; |
- NotifyOnReaderCreationHelper m_notifier; |
-}; |
- |
-class DoneHandle final : public WebDataConsumerHandle { |
- private: |
- std::unique_ptr<Reader> obtainReader(Client* client) override { |
- return WTF::wrapUnique(new RepeatingReader(Done, client)); |
- } |
- const char* debugName() const override { return "DoneHandle"; } |
-}; |
- |
-class UnexpectedErrorHandle final : public WebDataConsumerHandle { |
- private: |
- std::unique_ptr<Reader> obtainReader(Client* client) override { |
- return WTF::wrapUnique(new RepeatingReader(UnexpectedError, client)); |
- } |
- const char* debugName() const override { return "UnexpectedErrorHandle"; } |
-}; |
- |
class WebToFetchDataConsumerHandleAdapter : public FetchDataConsumerHandle { |
public: |
WebToFetchDataConsumerHandleAdapter( |
@@ -122,43 +79,10 @@ std::unique_ptr<WebDataConsumerHandle> createWaitingDataConsumerHandle() { |
return wrapUnique(new WaitingHandle); |
} |
-std::unique_ptr<WebDataConsumerHandle> createDoneDataConsumerHandle() { |
- return wrapUnique(new DoneHandle); |
-} |
- |
-std::unique_ptr<WebDataConsumerHandle> |
-createUnexpectedErrorDataConsumerHandle() { |
- return wrapUnique(new UnexpectedErrorHandle); |
-} |
- |
std::unique_ptr<FetchDataConsumerHandle> |
createFetchDataConsumerHandleFromWebHandle( |
std::unique_ptr<WebDataConsumerHandle> handle) { |
return wrapUnique(new WebToFetchDataConsumerHandleAdapter(std::move(handle))); |
} |
-NotifyOnReaderCreationHelper::NotifyOnReaderCreationHelper( |
- WebDataConsumerHandle::Client* client) |
- : m_factory(this) { |
- if (!client) |
- return; |
- // Note we don't need thread safety here because this object is |
- // bound to the current thread. |
- Platform::current()->currentThread()->getWebTaskRunner()->postTask( |
- BLINK_FROM_HERE, |
- WTF::bind(&NotifyOnReaderCreationHelper::notify, |
- m_factory.createWeakPtr(), WTF::unretained(client))); |
-} |
- |
-void NotifyOnReaderCreationHelper::notify( |
- WebDataConsumerHandle::Client* client) { |
- // |client| dereference is safe here because: |
- // - |this| is owned by a reader, |
- // so the reader outlives |this|, and |
- // - |client| is the client of the reader, so |client| outlives the reader |
- // (guaranteed by the user of the reader), |
- // and therefore |client| outlives |this|. |
- client->didGetReadable(); |
-} |
- |
} // namespace blink |