Reland [Resource Timing] Expose redirect timing information

Source/core/loader/cache/CachedResourceLoader.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
     version 2 of the License, or (at your option) any later version.
@@ skipping 38 matching lines @@
 class CachedScript;
 class CachedShader;
 class CachedTextTrack;
 class CachedXSLStyleSheet;
 class Document;
 class DocumentLoader;
 class Frame;
 class FrameLoader;
 class ImageLoader;
 class KURL;
+class ResourceTimingInfo;
 
 // The CachedResourceLoader provides a per-context interface to the MemoryCache
 // and enforces a bunch of security checks and rules for resource revalidation.
 // Its lifetime is roughly per-DocumentLoader, in that it is generally created
 // in the DocumentLoader constructor and loses its ability to generate network
 // requests when the DocumentLoader is destroyed. Documents also hold a 
 // RefPtr<CachedResourceLoader> for their lifetime (and will create one if they
 // are initialized without a Frame), so a Document can keep a CachedResourceLoader
 // alive past detach if scripts still reference the Document.
 class CachedResourceLoader : public RefCounted<CachedResourceLoader>, public ResourceLoaderHost {
@@ skipping 56 matching lines @@
     void preload(CachedResource::Type, CachedResourceRequest&, const String& charset);
     void checkForPendingPreloads();
     void printPreloadStats();
     bool canRequest(CachedResource::Type, const KURL&, const ResourceLoaderOptions&, bool forPreload = false);
     bool canAccess(CachedResource*);
 
     // ResourceLoaderHost
     virtual void incrementRequestCount(const CachedResource*) OVERRIDE;
     virtual void decrementRequestCount(const CachedResource*) OVERRIDE;
     virtual void didLoadResource(CachedResource*) OVERRIDE;
+    virtual void redirectReceived(CachedResource*, const ResourceResponse&) OVERRIDE;
     virtual void didFinishLoading(const CachedResource*, double finishTime, const ResourceLoaderOptions&) OVERRIDE;
     virtual void didChangeLoadingPriority(const CachedResource*, ResourceLoadPriority) OVERRIDE;
     virtual void didFailLoading(const CachedResource*, const ResourceError&, const ResourceLoaderOptions&) OVERRIDE;
     virtual void willSendRequest(const CachedResource*, ResourceRequest&, const ResourceResponse& redirectResponse, const ResourceLoaderOptions&) OVERRIDE;
     virtual void didReceiveResponse(const CachedResource*, const ResourceResponse&, const ResourceLoaderOptions&) OVERRIDE;
     virtual void didReceiveData(const CachedResource*, const char* data, int dataLength, int encodedDataLength, const ResourceLoaderOptions&) OVERRIDE;
     virtual void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*) OVERRIDE;
     virtual void didInitializeResourceLoader(ResourceLoader*) OVERRIDE;
     virtual void willTerminateResourceLoader(ResourceLoader*) OVERRIDE;
     virtual void willStartLoadingResource(ResourceRequest&) OVERRIDE;
@@ skipping 44 matching lines @@
     OwnPtr<ListHashSet<CachedResource*> > m_preloads;
     struct PendingPreload {
         CachedResource::Type m_type;
         CachedResourceRequest m_request;
         String m_charset;
     };
     Deque<PendingPreload> m_pendingPreloads;
 
     Timer<CachedResourceLoader> m_garbageCollectDocumentResourcesTimer;
 
-    HashMap<CachedResource*, CachedResourceInitiatorInfo> m_initiatorMap;
+    typedef HashMap<CachedResource*, RefPtr<ResourceTimingInfo> > ResourceTimingInfoMap;
+    ResourceTimingInfoMap m_resourceTimingInfoMap;
 
     // 29 bits left
     bool m_autoLoadImages : 1;
     bool m_imagesEnabled : 1;
     bool m_allowStaleResources : 1;
 };
 
 class ResourceCacheValidationSuppressor {
     WTF_MAKE_NONCOPYABLE(ResourceCacheValidationSuppressor);
     WTF_MAKE_FAST_ALLOCATED;
@@ skipping 13 matching lines @@
             m_loader->m_allowStaleResources = m_previousState;
     }
 private:
     CachedResourceLoader* m_loader;
     bool m_previousState;
 };
 
 } // namespace WebCore
 
 #endif