Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 235 matching lines @@
       return (resourceType == ResourceType::kIsMainResource &&
               (requestType == RequestType::kIsConditional ||
                method == RequestMethod::kIsPost))
                  ? WebCachePolicy::ValidatingCacheData
                  : WebCachePolicy::UseProtocolCachePolicy;
     case FrameLoadTypeBackForward:
       // Mutates the policy for POST requests to avoid form resubmission.
       return method == RequestMethod::kIsPost
                  ? WebCachePolicy::ReturnCacheDataDontLoad
                  : WebCachePolicy::ReturnCacheDataElseLoad;
-    case FrameLoadTypeReload:
-      return WebCachePolicy::ValidatingCacheData;
     case FrameLoadTypeReloadMainResource:
       return resourceType == ResourceType::kIsMainResource
                  ? WebCachePolicy::ValidatingCacheData
                  : WebCachePolicy::UseProtocolCachePolicy;
     case FrameLoadTypeReloadBypassingCache:
       // TODO(toyoshim): Should return BypassingCache always, but keep legacy
       // logic as is. To be changed in a follow-up patch soon.
       return (resourceType == ResourceType::kIsMainResource &&
               (requestType == RequestType::kIsConditional ||
                method == RequestMethod::kIsPost))
@@ skipping 100 matching lines @@
 
   if (m_document) {
     request.setExternalRequestStateFromRequestorAddressSpace(
         m_document->addressSpace());
   }
 
   // The remaining modifications are only necessary for HTTP and HTTPS.
   if (!request.url().isEmpty() && !request.url().protocolIsInHTTPFamily())
     return;
 
-  if (masterDocumentLoader()->loadType() == FrameLoadTypeReload)
+  if (masterDocumentLoader()->loadType() == FrameLoadTypeReloadMainResource)

[Takashi Toyoshima, 2017/03/23 08:45:42]

This will cause a behavior change.

Introduced by https://codereview.chromium.org/1783653002.
Will ask Raj in a separate CL.

[Takashi Toyoshima, 2017/03/24 03:29:17]

Resolved: https://codereview.chromium.org/2769033004/

     request.clearHTTPHeaderField("Save-Data");
 
   if (frame()->settings() && frame()->settings()->getDataSaverEnabled())
     request.setHTTPHeaderField("Save-Data", "on");
 }
 
 WebCachePolicy FrameFetchContext::resourceRequestCachePolicy(
     ResourceRequest& request,
     Resource::Type type,
     FetchRequest::DeferOption defer) const {
@@ skipping 691 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink