Restore user state on ReloadwithoutSubResourceCacheRevalidation

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 104 matching lines @@
 
 bool isReloadLoadType(FrameLoadType type)
 {
     return type == FrameLoadTypeReload
         || type == FrameLoadTypeReloadMainResource
         || type == FrameLoadTypeReloadBypassingCache;
 }
 
 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
 ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item, WebCachePolicy cachePolicy)
 {
     RefPtr<EncodedFormData> formData = item->formData();
     ResourceRequest request(item->url());
     request.setHTTPReferrer(item->referrer());
     request.setCachePolicy(cachePolicy);
     if (formData) {
@@ skipping 1479 matching lines @@
     tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoader->url() : String());
     return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const
 {
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTracedValue());
 }
 
 } // namespace blink