Remove blink::Stream related code from FileReaderLoader

third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

 /*
  * Copyright (C) 2010 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "core/fileapi/FileReaderLoader.h"
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/ThreadableLoader.h"
-#include "core/streams/Stream.h"
 #include "platform/blob/BlobRegistry.h"
 #include "platform/blob/BlobURL.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/StringBuilder.h"
 #include <memory>
 
 namespace blink {
 
 FileReaderLoader::FileReaderLoader(ReadType readType,
                                    FileReaderLoaderClient* client)
     : m_readType(readType),
       m_client(client),
-      m_urlForReadingIsStream(false),
       m_isRawDataConverted(false),
       m_stringResult(""),
       m_finishedLoading(false),
       m_bytesLoaded(0),
       m_totalBytes(-1),
       m_hasRange(false),
       m_rangeStart(0),
       m_rangeEnd(0),
       m_errorCode(FileError::kOK) {}
 
 FileReaderLoader::~FileReaderLoader() {
   cleanup();
   if (!m_urlForReading.isEmpty()) {
-    if (m_urlForReadingIsStream)
-      BlobRegistry::unregisterStreamURL(m_urlForReading);
-    else
-      BlobRegistry::revokePublicBlobURL(m_urlForReading);
+    BlobRegistry::revokePublicBlobURL(m_urlForReading);
   }
 }
 
-void FileReaderLoader::startInternal(ExecutionContext& executionContext,
-                                     const Stream* stream,
-                                     PassRefPtr<BlobDataHandle> blobData) {
+void FileReaderLoader::start(ExecutionContext* executionContext,
+                             PassRefPtr<BlobDataHandle> blobData) {
+  DCHECK(executionContext);
   // The blob is read by routing through the request handling layer given a
   // temporary public url.
   m_urlForReading =
-      BlobURL::createPublicURL(executionContext.getSecurityOrigin());
+      BlobURL::createPublicURL(executionContext->getSecurityOrigin());
   if (m_urlForReading.isEmpty()) {
     failed(FileError::kSecurityErr);
     return;
   }
 
-  if (blobData) {
-    ASSERT(!stream);
-    BlobRegistry::registerPublicBlobURL(executionContext.getSecurityOrigin(),
-                                        m_urlForReading, std::move(blobData));
-  } else {
-    ASSERT(stream);
-    BlobRegistry::registerStreamURL(executionContext.getSecurityOrigin(),
-                                    m_urlForReading, stream->url());
-  }
-
+  BlobRegistry::registerPublicBlobURL(executionContext->getSecurityOrigin(),
+                                      m_urlForReading, std::move(blobData));
   // Construct and load the request.
   ResourceRequest request(m_urlForReading);
   request.setExternalRequestStateFromRequestorAddressSpace(
-      executionContext.securityContext().addressSpace());
+      executionContext->securityContext().addressSpace());
 
   // FIXME: Should this really be 'internal'? Do we know anything about the
   // actual request that generated this fetch?
   request.setRequestContext(WebURLRequest::RequestContextInternal);
 
   request.setHTTPMethod(HTTPNames::GET);
   if (m_hasRange)
     request.setHTTPHeaderField(
         HTTPNames::Range,
         AtomicString(String::format("bytes=%d-%d", m_rangeStart, m_rangeEnd)));
 
   ThreadableLoaderOptions options;
   options.preflightPolicy = ConsiderPreflight;
   options.crossOriginRequestPolicy = DenyCrossOriginRequests;
   // FIXME: Is there a directive to which this load should be subject?
   options.contentSecurityPolicyEnforcement = DoNotEnforceContentSecurityPolicy;
   // Use special initiator to hide the request from the inspector.
   options.initiator = FetchInitiatorTypeNames::internal;
 
   ResourceLoaderOptions resourceLoaderOptions;
   resourceLoaderOptions.allowCredentials = AllowStoredCredentials;
 
   if (m_client) {
-    m_loader = ThreadableLoader::create(executionContext, this, options,
+    DCHECK(!m_loader);
+    m_loader = ThreadableLoader::create(*executionContext, this, options,
                                         resourceLoaderOptions);
     m_loader->start(request);
   } else {
     ThreadableLoader::loadResourceSynchronously(
-        executionContext, request, *this, options, resourceLoaderOptions);
+        *executionContext, request, *this, options, resourceLoaderOptions);
   }
 }
 
-void FileReaderLoader::start(ExecutionContext* executionContext,
-                             PassRefPtr<BlobDataHandle> blobData) {
-  ASSERT(executionContext);
-  m_urlForReadingIsStream = false;
-  startInternal(*executionContext, 0, std::move(blobData));
-}
-
-void FileReaderLoader::start(ExecutionContext* executionContext,
-                             const Stream& stream,
-                             unsigned readSize) {
-  ASSERT(executionContext);
-  if (readSize > 0) {
-    m_hasRange = true;
-    m_rangeStart = 0;
-    m_rangeEnd = readSize - 1;  // End is inclusive so (0,0) is a 1-byte read.
-  }
-
-  m_urlForReadingIsStream = true;
-  startInternal(*executionContext, &stream, nullptr);
-}
-
 void FileReaderLoader::cancel() {
   m_errorCode = FileError::kAbortErr;
   cleanup();
 }
 
 void FileReaderLoader::cleanup() {
   if (m_loader) {
     m_loader->cancel();
     m_loader = nullptr;
   }
@@ skipping 244 matching lines @@
 
   m_stringResult = builder.toString();
 }
 
 void FileReaderLoader::setEncoding(const String& encoding) {
   if (!encoding.isEmpty())
     m_encoding = WTF::TextEncoding(encoding);
 }
 
 }  // namespace blink