Introduce WebCachePolicy to merge cache policy enums

third_party/WebKit/public/web/WebFrame.h

 /*
  * Copyright (C) 2009 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 18 matching lines @@
  */
 
 #ifndef WebFrame_h
 #define WebFrame_h
 
 #include "WebCompositionUnderline.h"
 #include "WebHistoryItem.h"
 #include "WebIconURL.h"
 #include "WebNode.h"
 #include "WebURLLoaderOptions.h"
+#include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebCanvas.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebPrivateOwnPtr.h"
 #include "public/platform/WebReferrerPolicy.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/web/WebTreeScopeType.h"
 
 struct NPObject;
 
@@ skipping 296 matching lines @@
     virtual void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCache = false) = 0;
 
     // Load the given URL.
     virtual void loadRequest(const WebURLRequest&) = 0;
 
     // Load the given history state, corresponding to a back/forward
     // navigation of a frame. Multiple frames may be navigated via separate calls.
     virtual void loadHistoryItem(
         const WebHistoryItem&,
         WebHistoryLoadType,
-        WebURLRequest::CachePolicy = WebURLRequest::UseProtocolCachePolicy) = 0;
+        WebCachePolicy = WebCachePolicy::UseProtocolCachePolicy)

[dcheng, 2016/04/04 08:17:10]

I know your patch doesn't introduce this, but why is this a public API? It looks
like there are no callers from the embedder, just callers from inside Blink
itself.

[clamy, 2016/04/04 12:51:05]

I think this comes from the changes we made to only use load inside
RenderFrame::NavigateInternal, instead of specific subfunctions. At the time teh
change was made, the goal was to remove all other subfunctions, but there were
still used by the embedder (I think this one may have been used in the
HistoryController). If they no longer have callers, then they should be removed
from the public interface.

+        = 0;
 
     // This method is short-hand for calling LoadData, where mime_type is
     // "text/html" and text_encoding is "UTF-8".
     virtual void loadHTMLString(const WebData& html,
                                 const WebURL& baseURL,
                                 const WebURL& unreachableURL = WebURL(),
                                 bool replace = false) = 0;
 
     // Stops any pending loads on the frame and its children.
     virtual void stopLoading() = 0;
@@ skipping 238 matching lines @@
     WebFrame* m_firstChild;
     WebFrame* m_lastChild;
 
     WebFrame* m_opener;
     WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker;
 };
 
 } // namespace blink
 
 #endif