Refactoring: Move some Resource members from protected to private

third_party/WebKit/Source/core/fetch/RawResource.cpp

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 78 matching lines @@
 
 RawResource::RawResource(const ResourceRequest& resourceRequest, Type type, const ResourceLoaderOptions& options)
     : Resource(resourceRequest, type, options)
 {
 }
 
 void RawResource::appendData(const char* data, size_t length)
 {
     Resource::appendData(data, length);
 
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->dataReceived(this, data, length);
 }
 
 void RawResource::didAddClient(ResourceClient* c)
 {
     if (!hasClient(c))
         return;
     ASSERT(RawResourceClient::isExpectedType(c));
     RawResourceClient* client = static_cast<RawResourceClient*>(c);
@@ skipping 14 matching lines @@
     if (!clientWeak || !hasClient(c))
         return;
     Resource::didAddClient(client);
 }
 
 void RawResource::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
     Resource::willFollowRedirect(newRequest, redirectResponse);
 
     ASSERT(!redirectResponse.isNull());
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->redirectReceived(this, newRequest, redirectResponse);
 }
 
 void RawResource::willNotFollowRedirect()
 {
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->redirectBlocked();
 }
 
 void RawResource::responseReceived(const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle> handle)
 {
     bool isSuccessfulRevalidation = isCacheValidator() && response.httpStatusCode() == 304;
     Resource::responseReceived(response, nullptr);
 
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     ASSERT(count() <= 1 || !handle);
     while (RawResourceClient* c = w.next()) {
         // |handle| is cleared when passed, but it's not a problem because
         // |handle| is null when there are two or more clients, as asserted.
         c->responseReceived(this, m_response, std::move(handle));
     }
 
     // If we successfully revalidated, we won't get appendData() calls.
     // Forward the data to clients now instead.
     // Note: |m_data| can be null when no data is appended to the original
     // resource.
     if (isSuccessfulRevalidation && m_data) {
-        ResourceClientWalker<RawResourceClient> w(m_clients);
+        ResourceClientWalker<RawResourceClient> w(clients());
         while (RawResourceClient* c = w.next())
             c->dataReceived(this, m_data->data(), m_data->size());
     }
 }
 
 void RawResource::setSerializedCachedMetadata(const char* data, size_t size)
 {
     Resource::setSerializedCachedMetadata(data, size);
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->setSerializedCachedMetadata(this, data, size);
 }
 
 void RawResource::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->dataSent(this, bytesSent, totalBytesToBeSent);
 }
 
 void RawResource::didDownloadData(int dataLength)
 {
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->dataDownloaded(this, dataLength);
 }
 
 void RawResource::reportResourceTimingToClients(const ResourceTimingInfo& info)
 {
-    ResourceClientWalker<RawResourceClient> w(m_clients);
+    ResourceClientWalker<RawResourceClient> w(clients());
     while (RawResourceClient* c = w.next())
         c->didReceiveResourceTiming(this, info);
 }
 
 void RawResource::setDefersLoading(bool defers)
 {
     if (m_loader)
         m_loader->setDefersLoading(defers);
 }
 
@@ skipping 17 matching lines @@
 
 static bool isCacheableHTTPMethod(const AtomicString& method)
 {
     // Per http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.10,
     // these methods always invalidate the cache entry.
     return method != "POST" && method != "PUT" && method != "DELETE";
 }
 
 bool RawResource::canReuse(const ResourceRequest& newRequest) const
 {
-    if (m_options.dataBufferingPolicy == DoNotBufferData)
+    if (dataBufferingPolicy() == DoNotBufferData)
         return false;
 
     if (!isCacheableHTTPMethod(m_resourceRequest.httpMethod()))
         return false;
     if (m_resourceRequest.httpMethod() != newRequest.httpMethod())
         return false;
 
     if (m_resourceRequest.httpBody() != newRequest.httpBody())
         return false;
 
@@ skipping 16 matching lines @@
     for (const auto& header : oldHeaders) {
         AtomicString headerName = header.key;
         if (!shouldIgnoreHeaderForCacheReuse(headerName) && header.value != newHeaders.get(headerName))
             return false;
     }
 
     return true;
 }
 
 } // namespace blink