diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h')
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h index 895a01ea4a6..a103597b3b9 100644 --- a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h +++ b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h @@ -46,7 +46,6 @@ #include "platform/loader/fetch/ClientHintsPreferences.h" #include "platform/loader/fetch/RawResource.h" #include "platform/loader/fetch/ResourceError.h" -#include "platform/loader/fetch/ResourceLoaderOptions.h" #include "platform/loader/fetch/ResourceRequest.h" #include "platform/loader/fetch/ResourceResponse.h" #include "platform/loader/fetch/SubstituteData.h" @@ -71,6 +70,7 @@ class SerializedScriptValue; class WebServiceWorkerNetworkProvider; struct ViewportDescriptionWrapper; +// The DocumentLoader fetches a main resource and handles the result. class CORE_EXPORT DocumentLoader : public GarbageCollectedFinalized<DocumentLoader>, private RawResourceClient { @@ -164,7 +164,7 @@ class CORE_EXPORT DocumentLoader void SetItemForHistoryNavigation(HistoryItem* item) { history_item_ = item; } HistoryItem* GetHistoryItem() const { return history_item_; } - void StartLoadingMainResource(); + void StartLoading(); DocumentLoadTiming& GetTiming() { return document_load_timing_; } const DocumentLoadTiming& GetTiming() const { return document_load_timing_; } @@ -239,7 +239,7 @@ class CORE_EXPORT DocumentLoader InstallNewDocumentReason, ParserSynchronizationPolicy, const KURL& overriding_url); - void DidInstallNewDocument(Document*); + void DidInstallNewDocument(Document*, InstallNewDocumentReason); void DidCommitNavigation(); void EnsureWriter(const AtomicString& mime_type, @@ -336,6 +336,11 @@ class CORE_EXPORT DocumentLoader bool was_blocked_after_csp_; + static bool ShouldPersistUserGestureValue( + const SecurityOrigin* previous_security_origin, + const SecurityOrigin* new_security_origin); + static bool CheckOriginIsHttpOrHttps(const SecurityOrigin*); + // PlzNavigate: set when committing a navigation. The data has originally been // captured when the navigation was sent to the browser process, and it is // sent back at commit time. |