Make ThrottleController an ExecutionContext supplement.

Source/core/fileapi/FileReader.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 21 matching lines @@
 #include "core/fileapi/FileReader.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/ProgressEvent.h"
 #include "core/fileapi/File.h"
-#include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectorInstrumentation.h"
-#include "core/workers/WorkerClients.h"
-#include "core/workers/WorkerGlobalScope.h"
 #include "platform/Logging.h"
 #include "platform/Supplementable.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/Deque.h"
 #include "wtf/HashSet.h"
 #include "wtf/text/CString.h"
 
 namespace blink {
 
 namespace {
@@ skipping 11 matching lines @@
 #endif
 
 } // namespace
 
 // Embedders like chromium limit the number of simultaneous requests to avoid
 // excessive IPC congestion. We limit this to 100 per thread to throttle the
 // requests (the value is arbitrarily chosen).
 static const size_t kMaxOutstandingRequestsPerThread = 100;
 static const double progressNotificationIntervalMS = 50;
 
-typedef PersistentHeapDequeWillBeHeapDeque<Member<FileReader> > FileReaderDeque;
-typedef PersistentHeapHashSetWillBeHeapHashSet<Member<FileReader> > FileReaderHashSet;
-
-// FIXME: Oilpan: if ExecutionContext is moved to the heap, consider
-// making this object an ExecutionContext supplement (only.)
-class FileReader::ThrottlingController final : public NoBaseWillBeGarbageCollectedFinalized<FileReader::ThrottlingController>, public WillBeHeapSupplement<LocalFrame>, public WillBeHeapSupplement<WorkerClients> {
+class FileReader::ThrottlingController final : public NoBaseWillBeGarbageCollectedFinalized<FileReader::ThrottlingController>, public WillBeHeapSupplement<ExecutionContext> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FileReader::ThrottlingController);
 public:
     static ThrottlingController* from(ExecutionContext* context)
     {
         if (!context)
             return 0;
 
-        if (context->isDocument()) {
-            Document* document = toDocument(context);
-            if (!document->frame())
-                return 0;
-
-            ThrottlingController* controller = static_cast<ThrottlingController*>(WillBeHeapSupplement<LocalFrame>::from(document->frame(), supplementName()));
-            if (controller)
-                return controller;
-
+        ThrottlingController* controller = static_cast<ThrottlingController*>(WillBeHeapSupplement<ExecutionContext>::from(*context, supplementName()));
+        if (!controller) {
             controller = new ThrottlingController();
-            WillBeHeapSupplement<LocalFrame>::provideTo(*document->frame(), supplementName(), adoptPtrWillBeNoop(controller));
-            return controller;
+            WillBeHeapSupplement<ExecutionContext>::provideTo(*context, supplementName(), adoptPtrWillBeNoop(controller));
         }
-        ASSERT(!isMainThread());
-        ASSERT(context->isWorkerGlobalScope());
-        WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
-        ThrottlingController* controller = static_cast<ThrottlingController*>(WillBeHeapSupplement<WorkerClients>::from(workerGlobalScope->clients(), supplementName()));
-        if (controller)
-            return controller;
-
-        controller = new ThrottlingController();
-        WillBeHeapSupplement<WorkerClients>::provideTo(*workerGlobalScope->clients(), supplementName(), adoptPtrWillBeNoop(controller));
         return controller;
     }
 
     ~ThrottlingController() { }
 
     enum FinishReaderType { DoNotRunPendingReaders, RunPendingReaders };
 
     static void pushReader(ExecutionContext* context, FileReader* reader)
     {
         ThrottlingController* controller = from(context);
@@ skipping 23 matching lines @@
 
         controller->finishReader(reader, nextStep);
     }
 
     void trace(Visitor* visitor)
     {
 #if ENABLE(OILPAN)
         visitor->trace(m_pendingReaders);
         visitor->trace(m_runningReaders);
 #endif
-        WillBeHeapSupplement<LocalFrame>::trace(visitor);
-        WillBeHeapSupplement<WorkerClients>::trace(visitor);
+        WillBeHeapSupplement<ExecutionContext>::trace(visitor);
     }
 
 private:
     ThrottlingController()
         : m_maxRunningReaders(kMaxOutstandingRequestsPerThread)
     {
     }
 
     void pushReader(FileReader* reader)
     {
@@ skipping 38 matching lines @@
                 return;
             FileReader* reader = m_pendingReaders.takeFirst();
             reader->executePendingRead();
             m_runningReaders.add(reader);
         }
     }
 
     static const char* supplementName() { return "FileReaderThrottlingController"; }
 
     const size_t m_maxRunningReaders;
+
+    using FileReaderDeque = PersistentHeapDequeWillBeHeapDeque<Member<FileReader>>;
+    using FileReaderHashSet = PersistentHeapHashSetWillBeHeapHashSet<Member<FileReader>>;
+
     FileReaderDeque m_pendingReaders;
     FileReaderHashSet m_runningReaders;
 };
 
 FileReader* FileReader::create(ExecutionContext* context)
 {
     FileReader* fileReader = new FileReader(context);
     fileReader->suspendIfNeeded();
     return fileReader;
 }
@@ skipping 78 matching lines @@
     if (m_state == LOADING) {
         exceptionState.throwDOMException(InvalidStateError, "The object is already busy reading Blobs.");
         return;
     }
 
     if (blob->hasBeenClosed()) {
         exceptionState.throwDOMException(InvalidStateError, String(blob->isFile() ? "File" : "Blob") + " has been closed.");
         return;
     }
 
-    if (!ThrottlingController::from(executionContext())) {
+    ExecutionContext* context = executionContext();
+    if (!context) {
+        exceptionState.throwDOMException(AbortError, "Reading from a detached FileReader is not supported.");
+        return;
+    }
+
+    // A document loader will not load new resources once the Document has detached from its frame.
+    if (context->isDocument() && !toDocument(context)->frame()) {
         exceptionState.throwDOMException(AbortError, "Reading from a Document-detached FileReader is not supported.");
         return;
     }
 
     // "Snapshot" the Blob data rather than the Blob itself as ongoing
     // read operations should not be affected if close() is called on
     // the Blob being read.
     m_blobDataHandle = blob->blobDataHandle();
     m_blobType = blob->type();
     m_readType = type;
     m_state = LOADING;
     m_loadingState = LoadingStatePending;
     m_error = nullptr;
-    ThrottlingController::pushReader(executionContext(), this);
+    ASSERT(ThrottlingController::from(context));
+    ThrottlingController::pushReader(context, this);
 }
 
 void FileReader::executePendingRead()
 {
     ASSERT(m_loadingState == LoadingStatePending);
     m_loadingState = LoadingStateLoading;
 
     m_loader = adoptPtr(new FileReaderLoader(m_readType, this));
     m_loader->setEncoding(m_encoding);
     m_loader->setDataType(m_blobType);
@@ skipping 147 matching lines @@
 }
 
 void FileReader::trace(Visitor* visitor)
 {
     visitor->trace(m_error);
     RefCountedGarbageCollectedEventTargetWithInlineData<FileReader>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink