|
Allow LoadNavigationErrorPage to run scripts
Move the LoadNavigationErrorPage call from DidFinishDocumentLoad to
RunScriptsAtDocumentReady, because the former is in a
ScriptForbiddenScope and caused an assertion to be triggered in
blink::beforeCallEnteredCallback when the beforeunload listeners were
ran as a part of the navigation.
BUG= 590634
Committed: https://crrev.com/2718dfcda8f7afd32b5229d91c3314bf61faf16c
Cr-Commit-Position: refs/heads/master@{#383355}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+49 lines, -42 lines) |
Patch |
 |
M |
components/test_runner/web_frame_test_proxy.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/renderer/render_frame_impl.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
content/renderer/render_frame_impl.cc
|
View
|
|
3 chunks |
+23 lines, -17 lines |
0 comments
|
Download
|
 |
M |
content/renderer/render_view_browsertest.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/core/loader/EmptyClients.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/core/loader/FrameLoaderClient.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/FrameLoaderClientImpl.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
View
|
|
3 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
third_party/WebKit/public/web/WebFrameClient.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
Total messages: 11 (4 generated)
|