FrameFetchContext should respect BypassingCache for main resources

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 271 matching lines @@
   // Does not propagate cache policy for subresources after the load event.
   // TODO(toyoshim): We should be able to remove following parents' policy check
   // if each frame has a relevant FrameLoadType for reload and history
   // navigations.
   if (resourceType == ResourceType::kIsNotMainResource &&
       toLocalFrame(frame)->document()->loadEventFinished()) {
     return WebCachePolicy::UseProtocolCachePolicy;
   }
 
   // Respects BypassingCache rather than parent's policy.
-  // TODO(toyoshim): Adopt BypassingCache even for MainResource.
   FrameLoadType loadType =
       toLocalFrame(frame)->loader().documentLoader()->loadType();
-  if (resourceType == ResourceType::kIsNotMainResource &&
-      loadType == FrameLoadTypeReloadBypassingCache) {
+  if (loadType == FrameLoadTypeReloadBypassingCache)
     return WebCachePolicy::BypassingCache;
-  }
 
   // Respects parent's policy if it has a special one.
   WebCachePolicy parentPolicy =
       determineFrameWebCachePolicy(frame->tree().parent(), resourceType);
   if (parentPolicy != WebCachePolicy::UseProtocolCachePolicy)
     return parentPolicy;
 
   // Otherwise, follows FrameLoadType. Use kIsNotPost, kIsNotConditional, and
   // kIsNotMainResource to obtain a representative policy for the frame.
   return determineWebCachePolicy(RequestMethod::kIsNotPost,
@@ skipping 763 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink