summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2018-11-02 14:56:30 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2018-11-02 16:51:10 +0000
commitccb8f3ea6e7cf277d6067a8804eec94f85beabd4 (patch)
tree93c8ccbabc0ce81b5ff91e0e7891451cd435344a
parentbc188914f3ce1d2c82d2fd37f22e98de4dbd37e2 (diff)
Fixup for Fix for CVE-2018-17468
Use the right frame load type enum and constant. Change-Id: I2ab515831b9ddc3988827e378f8465bde7742a87 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--chromium/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/chromium/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 4e48c2d504c..0078cf8f47d 100644
--- a/chromium/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/chromium/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -818,7 +818,7 @@ bool FrameFetchContext::UpdateTimingInfoForIFrameNavigation(
if (!GetFrame()->should_send_resource_timing_info_to_parent())
return false;
// location may have been changed after initial navigation,
- if (MasterDocumentLoader()->LoadType() == WebFrameLoadType::kBackForward) {
+ if (MasterDocumentLoader()->LoadType() == kFrameLoadTypeBackForward) {
// ...and do not report subsequent navigations in the iframe too.
GetFrame()->SetShouldSendResourceTimingInfoToParent(false);
return false;