Refactoring: Move some Resource members from protected to private

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 244 matching lines @@
 
     void finishPendingClients();
 
     virtual void didAddClient(ResourceClient*);
     void willAddClientOrObserver();
 
     // |this| object may be dead after didRemoveClientOrObserver().
     void didRemoveClientOrObserver();
     virtual void allClientsAndObserversRemoved();
 
-    HashCountedSet<ResourceClient*> m_clients;
-    HashCountedSet<ResourceClient*> m_clientsAwaitingCallback;
-    HashCountedSet<ResourceClient*> m_finishedClients;
-
     bool hasClient(ResourceClient* client) { return m_clients.contains(client) || m_clientsAwaitingCallback.contains(client) || m_finishedClients.contains(client); }
 
     struct RedirectPair {
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     public:
         explicit RedirectPair(const ResourceRequest& request, const ResourceResponse& redirectResponse)
             : m_request(request)
             , m_redirectResponse(redirectResponse)
         {
         }
 
         ResourceRequest m_request;
         ResourceResponse m_redirectResponse;
     };
     const Vector<RedirectPair>& redirectChain() const { return m_redirectChain; }
 
     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;
 
+    const HashCountedSet<ResourceClient*>& clients() const { return m_clients; }
+    DataBufferingPolicy dataBufferingPolicy() const { return m_options.dataBufferingPolicy; }
+
     ResourceRequest m_resourceRequest;
     Member<ResourceLoader> m_loader;
-    ResourceLoaderOptions m_options;
 
     ResourceResponse m_response;
-    double m_responseTimestamp;
 
     RefPtr<SharedBuffer> m_data;
-    Timer<Resource> m_cancelTimer;
 
 private:
     class ResourceCallback;
     class CachedMetadataHandlerImpl;
     class ServiceWorkerResponseCachedMetadataHandler;
 
     void cancelTimerFired(Timer<Resource>*);
 
     void revalidationSucceeded(const ResourceResponse&);
     void revalidationFailed();
@@ skipping 29 matching lines @@
     unsigned m_preloadResult : 2; // PreloadResult
     unsigned m_type : 4; // Type
     unsigned m_status : 3; // Status
 
     unsigned m_needsSynchronousCacheHit : 1;
     unsigned m_linkPreload : 1;
     bool m_isRevalidating : 1;
 
     // Ordered list of all redirects followed while fetching this resource.
     Vector<RedirectPair> m_redirectChain;
+
+    HashCountedSet<ResourceClient*> m_clients;
+    HashCountedSet<ResourceClient*> m_clientsAwaitingCallback;
+    HashCountedSet<ResourceClient*> m_finishedClients;
+
+    ResourceLoaderOptions m_options;
+
+    double m_responseTimestamp;
+
+    Timer<Resource> m_cancelTimer;
 };
 
 class ResourceFactory {
     STACK_ALLOCATED();
 public:
     virtual Resource* create(const ResourceRequest&, const ResourceLoaderOptions&, const String&) const = 0;
     Resource::Type type() const { return m_type; }
 
 protected:
     ResourceFactory(Resource::Type type) : m_type(type) { }
 
     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