Introduce WebCachePolicy to merge cache policy enums

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 49 matching lines @@
 #include "core/page/Page.h"
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "platform/Logging.h"
 #include "platform/TracedValue.h"
 #include "platform/mhtml/MHTMLArchive.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityPolicy.h"
+#include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebFrameScheduler.h"
 
 #include <algorithm>
 
 namespace blink {
 
 FrameFetchContext::FrameFetchContext(DocumentLoader* loader, Document* document)
     : m_document(document)
     , m_documentLoader(loader)
     , m_imageFetched(false)
@@ skipping 69 matching lines @@
     Frame* parentFrame = frame()->tree().parent();
     if (parentFrame && parentFrame->isLocalFrame()) {
         CachePolicy parentCachePolicy = toLocalFrame(parentFrame)->document()->fetcher()->context().getCachePolicy();
         if (parentCachePolicy != CachePolicyVerify)
             return parentCachePolicy;
     }
 
     if (loadType == FrameLoadTypeReload)
         return CachePolicyRevalidate;
 
-    if (m_documentLoader && m_documentLoader->request().getCachePolicy() == ReturnCacheDataElseLoad)
+    if (m_documentLoader && m_documentLoader->request().getCachePolicy() == WebCachePolicy::ReturnCacheDataElseLoad)
         return CachePolicyHistoryBuffer;
     return CachePolicyVerify;
-
 }
 
-static ResourceRequestCachePolicy memoryCachePolicyToResourceRequestCachePolicy(
-    const CachePolicy policy) {
+static WebCachePolicy memoryCachePolicyToResourceRequestCachePolicy(const CachePolicy policy)
+{
     if (policy == CachePolicyVerify)
-        return UseProtocolCachePolicy;
+        return WebCachePolicy::UseProtocolCachePolicy;
     if (policy == CachePolicyRevalidate)
-        return ValidatingCacheData;
+        return WebCachePolicy::ValidatingCacheData;
     if (policy == CachePolicyReload)
-        return BypassingCache;
+        return WebCachePolicy::BypassingCache;
     if (policy == CachePolicyHistoryBuffer)
-        return ReturnCacheDataElseLoad;
-    return UseProtocolCachePolicy;
+        return WebCachePolicy::ReturnCacheDataElseLoad;
+    return WebCachePolicy::UseProtocolCachePolicy;
 }
 
-ResourceRequestCachePolicy FrameFetchContext::resourceRequestCachePolicy(const ResourceRequest& request, Resource::Type type) const
+WebCachePolicy FrameFetchContext::resourceRequestCachePolicy(const ResourceRequest& request, Resource::Type type) const
 {
     ASSERT(frame());
     if (type == Resource::MainResource) {
         FrameLoadType frameLoadType = frame()->loader().loadType();
         if (request.httpMethod() == "POST" && frameLoadType == FrameLoadTypeBackForward)
-            return ReturnCacheDataDontLoad;
+            return WebCachePolicy::ReturnCacheDataDontLoad;
         if (!frame()->host()->overrideEncoding().isEmpty())
-            return ReturnCacheDataElseLoad;
+            return WebCachePolicy::ReturnCacheDataElseLoad;
         if (frameLoadType == FrameLoadTypeSame || request.isConditional() || request.httpMethod() == "POST")
-            return ValidatingCacheData;
+            return WebCachePolicy::ValidatingCacheData;
 
         for (Frame* f = frame(); f; f = f->tree().parent()) {
             if (!f->isLocalFrame())
                 continue;
             frameLoadType = toLocalFrame(f)->loader().loadType();
             if (frameLoadType == FrameLoadTypeBackForward)
-                return ReturnCacheDataElseLoad;
+                return WebCachePolicy::ReturnCacheDataElseLoad;
             if (frameLoadType == FrameLoadTypeReloadBypassingCache)
-                return BypassingCache;
+                return WebCachePolicy::BypassingCache;
             if (frameLoadType == FrameLoadTypeReload)
-                return ValidatingCacheData;
+                return WebCachePolicy::ValidatingCacheData;
         }
-        return UseProtocolCachePolicy;
+        return WebCachePolicy::UseProtocolCachePolicy;
     }
 
     // For users on slow connections, we want to avoid blocking the parser in
     // the main frame on script loads inserted via document.write, since it can
     // add significant delays before page content is displayed on the screen.
     // For now, as a prototype, we block fetches for main frame scripts
     // inserted via document.write as long as the
     // disallowFetchForDocWrittenScriptsInMainFrame setting is enabled. In the
     // future, we'll extend this logic to only block if estimated network RTT
     // is above some threshold.
     if (type == Resource::Script && isMainFrame()) {
         const bool isInDocumentWrite = m_document && m_document->isInDocumentWrite();
         const bool disallowFetchForDocWriteScripts = frame()->settings() && frame()->settings()->disallowFetchForDocWrittenScriptsInMainFrame();
         if (isInDocumentWrite && disallowFetchForDocWriteScripts)
-            return ReturnCacheDataDontLoad;
+            return WebCachePolicy::ReturnCacheDataDontLoad;
     }
 
     if (request.isConditional())
-        return ValidatingCacheData;
+        return WebCachePolicy::ValidatingCacheData;
 
     if (m_documentLoader && m_document && !m_document->loadEventFinished()) {
         // For POST requests, we mutate the main resource's cache policy to avoid form resubmission.
         // This policy should not be inherited by subresources.
-        ResourceRequestCachePolicy mainResourceCachePolicy = m_documentLoader->request().getCachePolicy();
+        WebCachePolicy mainResourceCachePolicy = m_documentLoader->request().getCachePolicy();
         if (m_documentLoader->request().httpMethod() == "POST") {
-            if (mainResourceCachePolicy == ReturnCacheDataDontLoad)
-                return ReturnCacheDataElseLoad;
-            return UseProtocolCachePolicy;
+            if (mainResourceCachePolicy == WebCachePolicy::ReturnCacheDataDontLoad)
+                return WebCachePolicy::ReturnCacheDataElseLoad;
+            return WebCachePolicy::UseProtocolCachePolicy;
         }
         return memoryCachePolicyToResourceRequestCachePolicy(getCachePolicy());
     }
-    return UseProtocolCachePolicy;
+    return WebCachePolicy::UseProtocolCachePolicy;
 }
 
 // FIXME(http://crbug.com/274173):
 // |loader| can be null if the resource is loaded from imported document.
 // This means inspector, which uses DocumentLoader as an grouping entity,
 // cannot see imported documents.
 inline DocumentLoader* FrameFetchContext::ensureLoaderForNotifications() const
 {
     return m_documentLoader ? m_documentLoader.get() : frame()->loader().documentLoader();
 }
@@ skipping 525 matching lines @@
 }
 
 DEFINE_TRACE(FrameFetchContext)
 {
     visitor->trace(m_document);
     visitor->trace(m_documentLoader);
     FetchContext::trace(visitor);
 }
 
 } // namespace blink