| Index: third_party/WebKit/public/web/WebFrameLoadType.h
|
| diff --git a/third_party/WebKit/public/web/WebFrameLoadType.h b/third_party/WebKit/public/web/WebFrameLoadType.h
|
| index 5d09625dd251448bb3e8b11c8306189472e3324e..fad45d430223bca9092709ad935321bb8ed3308d 100644
|
| --- a/third_party/WebKit/public/web/WebFrameLoadType.h
|
| +++ b/third_party/WebKit/public/web/WebFrameLoadType.h
|
| @@ -8,30 +8,40 @@
|
| namespace blink {
|
|
|
| // The type of load for a navigation.
|
| -// TODO(clamy): Return a WebFrameLoadType instead of a WebHistoryCommitType
|
| -// in DidCommitProvisionalLoad.
|
| +// TODO(clamy, toyoshim): Currently WebFrameLoadType represents multiple
|
| +// concepts that should be orthogonal and could be represented by multiple enum
|
| +// classes. We should consider what WebFrameLoadType should represent and what
|
| +// shouldn't.
|
| +// See https://crbug.com/707715 for further discussion.
|
| //
|
| -// Standard:
|
| +// kStandard:
|
| // Follows network and cache protocols, e.g. using cached entries unless
|
| // they are expired. Used in usual navigations.
|
| -// BackForward:
|
| +// kBackForward:
|
| // Uses cached entries even if the entries are stale. Used in history back and
|
| // forward navigations.
|
| -// Reload:
|
| +// kReload:
|
| // Revalidates a cached entry for the main resource if one exists, but follows
|
| // protocols for other subresources. Blink internally uses this for the same
|
| // page navigation. Also used in optimized reload for mobiles in a field
|
| // trial.
|
| -// ReplaceCurrentItem:
|
| -// Same as Standard, but replaces current navigation entry in the history.
|
| -// InitialInChildFrame:
|
| +// kReplaceCurrentItem:
|
| +// Same as Standard, but replaces the current navigation entry in the history.
|
| +// kInitialInChildFrame:
|
| // Used in the first load for a subframe.
|
| -// InitialHistoryLoad:
|
| +// kInitialHistoryLoad:
|
| // Used in history navigation in a newly created frame.
|
| -// ReloadBypassingCache:
|
| +// kReloadBypassingCache:
|
| // Bypasses any caches, memory and disk cache in the browser, and caches in
|
| // proxy servers, to fetch fresh contents directly from the end server.
|
| // Used in Shift-Reload.
|
| +//
|
| +// Note: kInitialInChildFrame and kInitialHistoryLoad are used to determine
|
| +// the WebHistoryCommitType, but in terms of cache policy, it should work in the
|
| +// same manner as Standard and kBackForward respectively.
|
| +// kReplaceCurrentItem is used to determine if the current navigation should
|
| +// replace the current history item, but in terms of cache policy, it should
|
| +// work in the same manner as Standard.
|
| enum class WebFrameLoadType {
|
| kStandard,
|
| kBackForward,
|
|
|