third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2257743002: Restore user state on ReloadwithoutSubResourceCacheRevalidation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2257743002: Restore user state on ReloadwithoutSubResourceCacheRevalidation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing Torne's comments at #37 Created 4 years, 4 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

« android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java ('K') | « content/child/runtime_features.cc ('k') | third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in » ('j') | third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

index 0eb7138c45286ea4e9666d26bf2644b00a2aa9fc..b789299c64e429b7198dcd29b8e5c2ab75ee81a8 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -122,11 +122,10 @@ bool isReloadLoadType(FrameLoadType type)

static bool needsHistoryItemRestore(FrameLoadType type)

{

- // TODO(toyoshim): Check if this should return true for

- // FrameLoadTypeReloadMainResource.

- return type == FrameLoadTypeBackForward

- || type == FrameLoadTypeReload

- || type == FrameLoadTypeReloadBypassingCache;

+ if (!RuntimeEnabledFeatures::nonValidatingReloadEnabled() && type == FrameLoadTypeReloadMainResource)

+ return false;

+ // TODO(toyoshim): Shall we return true for FrameLoadTypeInitialHistoryLoad too?

+ return type == FrameLoadTypeBackForward || isReloadLoadType(type);

}

// static