Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.h

Issue 2694013005: Cleanup blink-side PlzNavigate logic (Closed)
Patch Set: Move most of the placeholder handling to startLoad() Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/FrameLoader.h
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.h b/third_party/WebKit/Source/core/loader/FrameLoader.h
index 30988a2e17a4a91d05bbd853c9e2b65a2788c8e0..1ba84850f199c2f9761921944f9c03491f9e27ce 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.h
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.h
@@ -202,23 +202,20 @@ class CORE_EXPORT FrameLoader final {
void restoreScrollPositionAndViewState();
- bool shouldContinueForNavigationPolicy(const ResourceRequest&,
- const SubstituteData&,
- DocumentLoader*,
- ContentSecurityPolicyDisposition,
- NavigationType,
- NavigationPolicy,
- FrameLoadType,
- bool isClientRedirect,
- HTMLFormElement*);
+ NavigationPolicy shouldContinueForNavigationPolicy(
+ const ResourceRequest&,
+ const SubstituteData&,
+ DocumentLoader*,
+ ContentSecurityPolicyDisposition,
+ NavigationType,
+ NavigationPolicy,
+ FrameLoadType,
+ bool isClientRedirect,
+ HTMLFormElement*);
// PlzNavigate: Navigations handled by the client are treated as
// provisional navigations.
- bool hasProvisionalNavigation() const {
- return provisionalDocumentLoader() || m_isNavigationHandledByClient;
- }
-
- void clearNavigationHandledByClient();
+ bool hasProvisionalNavigation() const { return provisionalDocumentLoader(); }
DECLARE_TRACE();
@@ -238,10 +235,10 @@ class CORE_EXPORT FrameLoader final {
const KURL&);
void processFragment(const KURL&, FrameLoadType, LoadStartType);
- bool checkLoadCanStart(FrameLoadRequest&,
- FrameLoadType,
- NavigationPolicy,
- NavigationType);
+ NavigationPolicy checkLoadCanStart(FrameLoadRequest&,
+ FrameLoadType,
+ NavigationPolicy,
+ NavigationType);
void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
enum class HistoryNavigationType { DifferentDocument, Fragment, HistoryApi };
@@ -271,8 +268,6 @@ class CORE_EXPORT FrameLoader final {
FrameLoadType,
NavigationType);
- void setNavigationHandledByClient();
-
Member<LocalFrame> m_frame;
AtomicString m_requiredCSP;
@@ -333,7 +328,6 @@ class CORE_EXPORT FrameLoader final {
bool m_dispatchingDidClearWindowObjectInMainWorld;
bool m_protectProvisionalLoader;
- bool m_isNavigationHandledByClient;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698