FrameFetchContext should handle all FrameLoadTypes

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 205 matching lines @@
           IsConnectionEffectively2G(effective_connection));
 }
 
 enum class RequestMethod { kIsPost, kIsNotPost };
 enum class RequestType { kIsConditional, kIsNotConditional };
 enum class ResourceType { kIsMainResource, kIsNotMainResource };
 
 // Determines WebCachePolicy for a main resource, or WebCachePolicy that is
 // corresponding to FrameLoadType.
 // TODO(toyoshim): Probably, we should split FrameLoadType to WebCachePolicy
-// conversion logic into a separate function once other TODOs in this function
-// are resolved.
+// conversion logic into a separate function.
 WebCachePolicy DetermineWebCachePolicy(RequestMethod method,
                                        RequestType request_type,
                                        ResourceType resource_type,
                                        FrameLoadType load_type) {
   switch (load_type) {
     case kFrameLoadTypeStandard:
+    case kFrameLoadTypeReplaceCurrentItem:
+    case kFrameLoadTypeInitialInChildFrame:
       return (request_type == RequestType::kIsConditional ||
               method == RequestMethod::kIsPost)
                  ? WebCachePolicy::kValidatingCacheData
                  : WebCachePolicy::kUseProtocolCachePolicy;
-    case kFrameLoadTypeReplaceCurrentItem:
-    case kFrameLoadTypeInitialInChildFrame:
-      // TODO(toyoshim): Should be the same with FrameLoadTypeStandard, but
-      // keep legacy logic as is. To be changed in a follow-up patch soon.
-      return (resource_type == ResourceType::kIsMainResource &&
-              (request_type == RequestType::kIsConditional ||
-               method == RequestMethod::kIsPost))
-                 ? WebCachePolicy::kValidatingCacheData
-                 : WebCachePolicy::kUseProtocolCachePolicy;
+    case kFrameLoadTypeBackForward:
     case kFrameLoadTypeInitialHistoryLoad:
-      // TODO(toyoshim): Should be the same with FrameLoadTypeBackForward, but
-      // keep legacy logic as is. To be changed in a follow-up patch soon.
-      return (resource_type == ResourceType::kIsMainResource &&
-              (request_type == RequestType::kIsConditional ||
-               method == RequestMethod::kIsPost))
-                 ? WebCachePolicy::kValidatingCacheData
-                 : WebCachePolicy::kUseProtocolCachePolicy;
-    case kFrameLoadTypeBackForward:
       // Mutates the policy for POST requests to avoid form resubmission.
       return method == RequestMethod::kIsPost
                  ? WebCachePolicy::kReturnCacheDataDontLoad
                  : WebCachePolicy::kReturnCacheDataElseLoad;
     case kFrameLoadTypeReload:
       return resource_type == ResourceType::kIsMainResource
                  ? WebCachePolicy::kValidatingCacheData
                  : WebCachePolicy::kUseProtocolCachePolicy;
     case kFrameLoadTypeReloadBypassingCache:
       return WebCachePolicy::kBypassingCache;
@@ skipping 821 matching lines @@
   return GetFrame()->FrameScheduler()->LoadingTaskRunner();
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->Trace(document_);
   visitor->Trace(document_loader_);
   FetchContext::Trace(visitor);
 }
 
 }  // namespace blink