Do not block document.written scripts in page reloads

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

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 27d945ba2eca6e0cfe8e6ccd10bfb288f1749d37..9c2f67180b0ba0d063e4428e53b9a2346f2791d5 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -87,6 +87,17 @@ bool shouldDisallowFetchForMainFrameScript(const ResourceRequest& request, Fetch
     if (!document.settings())
         return false;
 
+    if (!document.frame())
+        return false;
+
+    // Do not block scripts if it is a page reload. This is to enable pages to
+    // recover if blocking of a script is leading to a page break and the user
+    // reloads the page.
+    const FrameLoadType loadType = document.frame()->loader().loadType();
+    const bool isReload = (loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadBypassingCache);

[jkarlin, 2016/04/13 18:38:36]

re FrameLoadTypeSame: So the user essentially goes to the navigation bar and
hits enter to load the
same page again? Seems like a reload signal to me. I think we should block
intervention in that case.

[shivanisha, 2016/04/14 17:59:56]

Sounds good to me. Yes, if user goes to the navigation bar and hits enter to
load the
same page again then its treated as FrameLoadTypeSame.
Adding FrameLoadTypeSame as well. Not able to add a layout test for that
condition, though, because this intervention works only for main frame and I
didn't see a way to repeat the main frame URL without calling reload.

+    if (isReload)
+        return false;
+
     const bool isSlowConnection = networkStateNotifier().connectionType() == WebConnectionTypeCellular2G;
     const bool disallowFetch = document.settings()->disallowFetchForDocWrittenScriptsInMainFrame() || (document.settings()->disallowFetchForDocWrittenScriptsInMainFrameOnSlowConnections() && isSlowConnection);
     if (!disallowFetch)