Don't keep a separate m_revalidatingRequest on Resource

third_party/WebKit/Source/core/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
     version 2 of the License, or (at your option) any later version.
@@ skipping 194 matching lines @@
     void setDataBufferingPolicy(DataBufferingPolicy);
 
     bool isUnusedPreload() const { return isPreloaded() && getPreloadResult() == PreloadNotReferenced; }
     bool isPreloaded() const { return m_preloadCount; }
     void increasePreloadCount() { ++m_preloadCount; }
     void decreasePreloadCount() { ASSERT(m_preloadCount); --m_preloadCount; }
 
     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; }
 
     double currentAge() const;
     double freshnessLifetime();
     double stalenessLifetime();
 
     bool isPurgeable() const;
     bool lock();
@@ skipping 60 matching lines @@
 
     virtual bool isSafeToUnlock() const { return false; }
     virtual void destroyDecodedDataIfPossible() { }
 
     virtual void markClientsAndObserversFinished();
 
     // Returns the memory dump name used for tracing. See Resource::onMemoryDump.
     String getMemoryDumpName() const;
 
     ResourceRequest m_resourceRequest;
-    ResourceRequest m_revalidatingRequest;
     Member<ResourceLoader> m_loader;
     ResourceLoaderOptions m_options;
 
     ResourceResponse m_response;
     double m_responseTimestamp;
 
     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;
     class CachedMetadataHandlerImpl;
     class ServiceWorkerResponseCachedMetadataHandler;
 
     void cancelTimerFired(Timer<Resource>*);
 
     void revalidationSucceeded(const ResourceResponse&);
     void revalidationFailed();
@@ skipping 46 matching lines @@
 
     Resource::Type m_type;
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->getType() == Resource::typeName, resource.getType() == Resource::typeName);
 
 } // namespace blink
 
 #endif