Stop using Resource::ResourceCallback and make Resource have a TaskHandle

third_party/WebKit/Source/platform/loader/fetch/Resource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 11 matching lines @@
 */
 
 #ifndef Resource_h
 #define Resource_h
 
 #include <memory>
 #include "platform/MemoryCoordinator.h"
 #include "platform/PlatformExport.h"
 #include "platform/SharedBuffer.h"
 #include "platform/Timer.h"
+#include "platform/WebTaskRunner.h"
 #include "platform/instrumentation/tracing/web_process_memory_dump.h"
 #include "platform/loader/fetch/CachedMetadataHandler.h"
 #include "platform/loader/fetch/IntegrityMetadata.h"
 #include "platform/loader/fetch/ResourceError.h"
 #include "platform/loader/fetch/ResourceLoadPriority.h"
 #include "platform/loader/fetch/ResourceLoaderOptions.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/loader/fetch/ResourceResponse.h"
 #include "platform/loader/fetch/ResourceStatus.h"
 #include "platform/wtf/Allocator.h"
@@ skipping 364 matching lines @@
   }
 
   void SetCachePolicyBypassingCache();
   void SetPreviewsStateNoTransform();
   void ClearRangeRequestHeader();
 
   SharedBuffer* Data() const { return data_.Get(); }
   void ClearData();
 
  private:
-  class ResourceCallback;
   class CachedMetadataHandlerImpl;
   class ServiceWorkerResponseCachedMetadataHandler;
 
   void CancelTimerFired(TimerBase*);
 
   void RevalidationSucceeded(const ResourceResponse&);
   void RevalidationFailed();
 
   size_t CalculateOverheadSize() const;
 
@@ skipping 46 matching lines @@
 
   HeapHashCountedSet<WeakMember<ResourceClient>> clients_;
   HeapHashCountedSet<WeakMember<ResourceClient>> clients_awaiting_callback_;
   HeapHashCountedSet<WeakMember<ResourceClient>> finished_clients_;
 
   ResourceLoaderOptions options_;
 
   double response_timestamp_;
 
   TaskRunnerTimer<Resource> cancel_timer_;
+  TaskHandle async_callback_task_handle_;

[kinuko, 2017/05/10 07:18:09]

nit: async_finish_pending_clients_task_ or something like that?

[horo, 2017/05/10 07:35:09]

Done.

 
   ResourceRequest resource_request_;
   Member<ResourceLoader> loader_;
   ResourceResponse response_;
 
   RefPtr<SharedBuffer> data_;
 };
 
 class ResourceFactory {
   STACK_ALLOCATED();
@@ skipping 11 matching lines @@
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName)                      \
   DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource,       \
                     resource->GetType() == Resource::k##typeName, \
                     resource.GetType() == Resource::k##typeName);
 
 }  // namespace blink
 
 #endif