Don't keep a separate m_revalidatingRequest on Resource

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

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index 37a5c9f68a7584bba45e7ec5cb3b7a43f7b30e70..ca7879bbccbaafff75349d4de646e0966439d42c 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -212,7 +212,7 @@ public:
     bool canReuseRedirectChain();
     bool mustRevalidateDueToCacheHeaders();
     bool canUseCacheValidator();
-    bool isCacheValidator() const { return !m_revalidatingRequest.isNull(); }
+    bool isCacheValidator() const { return m_isRevalidating; }
     bool hasCacheControlNoStoreHeader();
     bool hasVaryHeader() const;
     virtual bool mustRefetchDueToIntegrityMetadata(const FetchRequest& request) const { return false; }
@@ -293,7 +293,6 @@ protected:
     String getMemoryDumpName() const;
 
     ResourceRequest m_resourceRequest;
-    ResourceRequest m_revalidatingRequest;
     Member<ResourceLoader> m_loader;
     ResourceLoaderOptions m_options;
 
@@ -302,6 +301,7 @@ protected:
 
     RefPtr<SharedBuffer> m_data;
     Timer<Resource> m_cancelTimer;
+    bool m_isRevalidating;

[yhirano, 2016/05/23 11:40:38]

This member can be in the private section. Its getter is already provided.

[yhirano, 2016/05/23 11:40:38]

[optional] Perhaps it might be good to have this boolean as a bitfield.

[Nate Chapin, 2016/05/26 21:43:03]

Done.

[Nate Chapin, 2016/05/26 21:43:03]

Done.

 
 private:
     class ResourceCallback;