Move hacks for Inspector in restoreCachedResourceIfNeeded() to ResourceFetcher

third_party/WebKit/Source/core/fetch/ResourceFetcher.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     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 128 matching lines @@
 
   void acceptDataFromThreadedReceiver(unsigned long identifier,
                                       const char* data,
                                       int dataLength,
                                       int encodedDataLength);
 
   enum ResourceLoadStartType {
     ResourceLoadingFromNetwork,
     ResourceLoadingFromCache
   };
-  void requestLoadStarted(unsigned long identifier,
-                          Resource*,
-                          const FetchRequest&,
-                          ResourceLoadStartType,
-                          bool isStaticData = false);
   static const ResourceLoaderOptions& defaultResourceOptions();
 
   String getCacheIdentifier() const;
 
   static void determineRequestContext(ResourceRequest&,
                                       Resource::Type,
                                       bool isMainFrame);
   void determineRequestContext(ResourceRequest&, Resource::Type);
 
   void updateAllImageResourcePriorities();
 
   void reloadLoFiImages();
 
   // This is only exposed for testing purposes.
   HeapListHashSet<Member<Resource>>* preloads() { return m_preloads.get(); }
 
+  // Workaround for https://crbug.com/666214.
+  // TODO(hiroshige): Remove this hack.
+  void emulateLoadStartedForInspector(Resource*,
+                                      const KURL&,
+                                      WebURLRequest::RequestContext,
+                                      const AtomicString& initiatorName);
+
  private:
   friend class ResourceCacheValidationSuppressor;
 
   explicit ResourceFetcher(FetchContext*);
 
   void initializeRevalidation(ResourceRequest&, Resource*);
   Resource* createResourceForLoading(FetchRequest&,
                                      const String& charset,
                                      const ResourceFactory&);
   void storeResourceTimingInitiatorInformation(Resource*);
@@ skipping 20 matching lines @@
 
   void initializeResourceRequest(ResourceRequest&,
                                  Resource::Type,
                                  FetchRequest::DeferOption);
   void willSendRequest(unsigned long identifier,
                        ResourceRequest&,
                        const ResourceResponse&,
                        const ResourceLoaderOptions&);
   bool canAccessResponse(Resource*, const ResourceResponse&) const;
 
+  void requestLoadStarted(unsigned long identifier,
+                          Resource*,
+                          const FetchRequest&,
+                          ResourceLoadStartType,
+                          bool isStaticData = false);
+
   bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
   bool shouldDeferImageLoad(const KURL&) const;
 
   void resourceTimingReportTimerFired(TimerBase*);
 
   void reloadImagesIfNotDeferred();
 
   void updateMemoryCacheStats(Resource*,
                               RevalidationPolicy,
                               const FetchRequest&,
@@ skipping 63 matching lines @@
   }
 
  private:
   Member<ResourceFetcher> m_loader;
   bool m_previousState;
 };
 
 }  // namespace blink
 
 #endif  // ResourceFetcher_h