Source/modules/fetch/Body.h - Issue 1173173006: [2c] Replace Body::readAsyncFromBlob with readAsyncFromFetchDataConsumerHandle

Unified Diff: Source/modules/fetch/Body.h

Issue 1173173006: [2c] Replace Body::readAsyncFromBlob with readAsyncFromFetchDataConsumerHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add #include to ResponseTest.cpp Created 5 years, 6 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: Source/modules/fetch/Body.h

diff --git a/Source/modules/fetch/Body.h b/Source/modules/fetch/Body.h

index 6a9435d7bf9c4ea313fb574ab3d1aac6590aa943..64ef336982a4de200ca13e61af58509e37109db1 100644

--- a/Source/modules/fetch/Body.h

+++ b/Source/modules/fetch/Body.h

@@ -10,9 +10,9 @@

#include "bindings/core/v8/ScriptWrappable.h"

#include "core/dom/ActiveDOMObject.h"

#include "core/dom/DOMArrayBuffer.h"

-#include "core/fileapi/FileReaderLoader.h"

-#include "core/fileapi/FileReaderLoaderClient.h"

#include "modules/ModulesExport.h"

+#include "modules/fetch/FetchDataConsumerHandle.h"

+#include "modules/fetch/FetchDataLoader.h"

#include "platform/blob/BlobData.h"

#include "platform/heap/Handle.h"

#include "wtf/RefPtr.h"

@@ -29,9 +29,9 @@ class MODULES_EXPORT Body

: public GarbageCollectedFinalized<Body>

, public ScriptWrappable

, public ActiveDOMObject

- , public FileReaderLoaderClient {

+ , public FetchDataLoader::Client {

yhirano 2015/07/03 04:31:00 Maybe you need to add MODULES_EXPORT to FetchDataL

hiroshige 2015/07/03 06:45:18 Done.

DEFINE_WRAPPERTYPEINFO();

- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Body);

+ USING_GARBAGE_COLLECTED_MIXIN(Body);

public:

class ReadableStreamSource;

enum ResponseType {

@@ -95,13 +95,14 @@ private:

void readAllFromStream();

ScriptPromise readAsync(ScriptState*, ResponseType);

void readAsyncFromBlob(PassRefPtr<BlobDataHandle>);

+ void readAsyncFromFetchDataConsumerHandle(FetchDataConsumerHandle*, const String& mimeType);

void resolveJSON(const String&);

- // FileReaderLoaderClient functions.

- virtual void didStartLoading() override;

- virtual void didReceiveData() override;

- virtual void didFinishLoading() override;

- virtual void didFail(FileError::ErrorCode) override;

+ // FetchDataLoader::Client functions.

+ void didFetchDataLoadFailed() override;

+ void didFetchDataLoadedBlobHandle(PassRefPtr<BlobDataHandle>) override;

+ void didFetchDataLoadedArrayBuffer(PassRefPtr<DOMArrayBuffer>) override;

+ void didFetchDataLoadedString(const String&) override;

void didBlobHandleReceiveError(DOMException*);

@@ -115,7 +116,7 @@ private:

void didFinishLoadingViaStream(PassRefPtr<DOMArrayBuffer>);

- OwnPtr<FileReaderLoader> m_loader;

+ Member<FetchDataLoader> m_fetchDataLoader;

bool m_bodyUsed;

ResponseType m_responseType;

RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;

« no previous file with comments | « Source/modules/cachestorage/Cache.cpp ('k') | Source/modules/fetch/Body.cpp » ('j') | no next file with comments »