(WONT COMMIT) FetchAPI: Make GlobalFetchImpl non-templated

Source/modules/fetch/GlobalFetch.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/GlobalFetch.h"
 
 #include "core/dom/ActiveDOMObject.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/UseCounter.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/fetch/FetchManager.h"
 #include "modules/fetch/Request.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 namespace {
 
-template <typename T>
-class GlobalFetchImpl final : public NoBaseWillBeGarbageCollectedFinalized<GlobalFetchImpl<T>>, public WillBeHeapSupplement<T> {
+class GlobalFetchImpl final : public NoBaseWillBeGarbageCollectedFinalized<GlobalFetchImpl>, public WillBeHeapSupplement<LocalDOMWindow>, public WillBeHeapSupplement<WorkerGlobalScope> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GlobalFetchImpl);
 public:
-    static GlobalFetchImpl& from(T& supplementable, ExecutionContext* executionContext)
+    static GlobalFetchImpl& from(LocalDOMWindow& supplementable, ExecutionContext* executionContext)
     {
-        GlobalFetchImpl* supplement = static_cast<GlobalFetchImpl*>(WillBeHeapSupplement<T>::from(supplementable, name()));
+        GlobalFetchImpl* supplement = static_cast<GlobalFetchImpl*>(WillBeHeapSupplement<LocalDOMWindow>::from(supplementable, name()));
         if (!supplement) {
             supplement = new GlobalFetchImpl(executionContext);
-            WillBeHeapSupplement<T>::provideTo(supplementable, name(), adoptPtrWillBeNoop(supplement));
+            WillBeHeapSupplement<LocalDOMWindow>::provideTo(supplementable, name(), adoptPtrWillBeNoop(supplement));
         }
         return *supplement;
     }
+
+    static GlobalFetchImpl& from(WorkerGlobalScope& supplementable, ExecutionContext* executionContext)
+    {
+        GlobalFetchImpl* supplement = static_cast<GlobalFetchImpl*>(WillBeHeapSupplement<WorkerGlobalScope>::from(supplementable, name()));
+        if (!supplement) {
+            supplement = new GlobalFetchImpl(executionContext);
+            WillBeHeapSupplement<WorkerGlobalScope>::provideTo(supplementable, name(), adoptPtrWillBeNoop(supplement));
+        }
+        return *supplement;
+    }
 
     ScriptPromise fetch(ScriptState* scriptState, const RequestInfo& input, const Dictionary& init, ExceptionState& exceptionState)
     {
         if (m_fetchManager->isStopped()) {
             exceptionState.throwTypeError("The global scope is shutting down.");
             return ScriptPromise();
         }
 
         // "Let |r| be the associated request of the result of invoking the
         // initial value of Request as constructor with |input| and |init| as
         // arguments. If this throws an exception, reject |p| with it."
         Request* r = Request::create(m_stopDetector->executionContext(), input, init, exceptionState);
         if (exceptionState.hadException())
             return ScriptPromise();
         return m_fetchManager->fetch(scriptState, r->passRequestData());
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_fetchManager);
         visitor->trace(m_stopDetector);
-        WillBeHeapSupplement<T>::trace(visitor);
+        WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
+        WillBeHeapSupplement<WorkerGlobalScope>::trace(visitor);
     }
 
 private:
     class StopDetector final : public NoBaseWillBeGarbageCollectedFinalized<StopDetector>, public ActiveDOMObject {
         WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StopDetector);
     public:
         static PassOwnPtrWillBeRawPtr<StopDetector> create(ExecutionContext* executionContext, FetchManager* fetchManager)
         {
             return adoptPtrWillBeNoop(new StopDetector(executionContext, fetchManager));
         }
@@ skipping 28 matching lines @@
 
     OwnPtrWillBeMember<FetchManager> m_fetchManager;
     OwnPtrWillBeMember<StopDetector> m_stopDetector;
 };
 
 } // namespace
 
 ScriptPromise GlobalFetch::fetch(ScriptState* scriptState, DOMWindow& window, const RequestInfo& input, const Dictionary& init, ExceptionState& exceptionState)
 {
     UseCounter::count(window.executionContext(), UseCounter::Fetch);
-    return GlobalFetchImpl<LocalDOMWindow>::from(toLocalDOMWindow(window), window.executionContext()).fetch(scriptState, input, init, exceptionState);
+    return GlobalFetchImpl::from(toLocalDOMWindow(window), window.executionContext()).fetch(scriptState, input, init, exceptionState);
 }
 
 ScriptPromise GlobalFetch::fetch(ScriptState* scriptState, WorkerGlobalScope& worker, const RequestInfo& input, const Dictionary& init, ExceptionState& exceptionState)
 {
     // Note that UseCounter doesn't work with SharedWorker or ServiceWorker.
     UseCounter::count(worker.executionContext(), UseCounter::Fetch);
-    return GlobalFetchImpl<WorkerGlobalScope>::from(worker, worker.executionContext()).fetch(scriptState, input, init, exceptionState);
+    return GlobalFetchImpl::from(worker, worker.executionContext()).fetch(scriptState, input, init, exceptionState);
 }
 
 } // namespace blink