Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)

Created:
4 years, 3 months ago by clamy
Modified:
4 years, 2 months ago
CC:
chromium-reviews, extensions-reviews_chromium.org, creis+watch_chromium.org, mlamouri+watch-content_chromium.org, Peter Beverloo, nasko+codewatch_chromium.org, jam, Randy Smith (Not in Mondays), jochen+watch_chromium.org, darin-cc_chromium.org, mmenke, devtools-reviews_chromium.org, loading-reviews_chromium.org, chromium-apps-reviews_chromium.org, pfeldman
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Merge CrossSiteResourceHandler and NavigationResourceThrottle This CL merges CrossSiteResourceHandler and NavigationResourceThrottle. It also removes the CrossSiteResourceRequest in favor of using NavigationHandle. This allows WebContentsObserver::ReadyToCommit navigation to be called in the non-PlzNavigate architecture. A detailed description of the change can be found at https://docs.google.com/a/chromium.org/document/d/1Ze5_RNvUQV4ltWvFU5MY3L_TRIAux88iLadQIPHTMqk/edit?usp=sharing. BUG=621856 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation Committed: https://crrev.com/f40a0349f8575ccd544d6844dccd56119b87170c Cr-Commit-Position: refs/heads/master@{#421216}

Patch Set 1 #

Patch Set 2 : Fixed test compilation error #

Total comments: 42

Patch Set 3 : Rebase #

Patch Set 4 : Addressed comments #

Total comments: 4

Patch Set 5 : Comments + fixed issue with pending RFh deletion #

Patch Set 6 : Rebase #

Total comments: 39

Patch Set 7 : ]Rebase #

Patch Set 8 : Addressed comments #

Total comments: 8

Patch Set 9 : Addressed comments + fixed android interstitial bug #

Patch Set 10 : Change to android fix + compile error #

Total comments: 24

Patch Set 11 : Rebase on https://codereview.chromium.org/2364943002/ #

Patch Set 12 : Addressed comments #

Total comments: 4

Patch Set 13 : Rebase #

Patch Set 14 : Readded code that was mistakenly removed during rebase #

Patch Set 15 : Addressed nits #

Unified diffs Side-by-side diffs Delta from patch set Stats (+331 lines, -810 lines) Patch
M chrome/browser/chrome_content_browser_client.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chrome_content_browser_client.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +3 lines, -2 lines 0 comments Download
M chrome/browser/extensions/chrome_content_browser_client_extensions_part.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc View 4 1 chunk +2 lines, -3 lines 0 comments Download
M chrome/browser/prerender/prerender_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/browser_browsertest.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M content/browser/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 2 chunks +0 lines, -4 lines 0 comments Download
M content/browser/devtools/render_frame_devtools_agent_host.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +5 lines, -2 lines 0 comments Download
D content/browser/frame_host/cross_site_transferring_request.h View 1 chunk +0 lines, -42 lines 0 comments Download
D content/browser/frame_host/cross_site_transferring_request.cc View 1 chunk +0 lines, -46 lines 0 comments Download
M content/browser/frame_host/navigation_controller_impl_unittest.cc View 1 2 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/frame_host/navigation_handle_impl.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 7 chunks +57 lines, -1 line 0 comments Download
M content/browser/frame_host/navigation_handle_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 10 chunks +128 lines, -13 lines 0 comments Download
M content/browser/frame_host/navigation_handle_impl_unittest.cc View 1 2 3 4 5 1 chunk +1 line, -0 lines 0 comments Download
M content/browser/frame_host/navigation_request.cc View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +4 lines, -0 lines 0 comments Download
M content/browser/frame_host/navigator_impl.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +0 lines, -4 lines 0 comments Download
M content/browser/frame_host/render_frame_host_impl.h View 1 2 3 4 5 6 2 chunks +0 lines, -13 lines 0 comments Download
M content/browser/frame_host/render_frame_host_impl.cc View 1 2 3 4 5 6 7 8 9 10 3 chunks +0 lines, -17 lines 0 comments Download
M content/browser/frame_host/render_frame_host_manager.h View 1 2 3 4 5 6 7 8 9 10 3 chunks +0 lines, -11 lines 0 comments Download
M content/browser/frame_host/render_frame_host_manager.cc View 1 2 3 4 5 6 7 8 9 10 7 chunks +25 lines, -38 lines 0 comments Download
M content/browser/frame_host/render_frame_host_manager_unittest.cc View 1 2 1 chunk +0 lines, -1 line 0 comments Download
D content/browser/loader/cross_site_resource_handler.h View 1 2 1 chunk +0 lines, -97 lines 0 comments Download
D content/browser/loader/cross_site_resource_handler.cc View 1 2 1 chunk +0 lines, -388 lines 0 comments Download
M content/browser/loader/navigation_resource_throttle.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +11 lines, -0 lines 0 comments Download
M content/browser/loader/navigation_resource_throttle.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 10 chunks +62 lines, -2 lines 0 comments Download
M content/browser/loader/resource_dispatcher_host_impl.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -1 line 0 comments Download
M content/browser/loader/resource_dispatcher_host_impl.cc View 1 2 3 4 5 6 7 8 9 10 4 chunks +2 lines, -28 lines 0 comments Download
M content/browser/loader/resource_dispatcher_host_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 18 chunks +7 lines, -66 lines 0 comments Download
M content/browser/loader/resource_loader.h View 1 2 3 4 5 6 7 8 9 10 2 chunks +4 lines, -1 line 0 comments Download
M content/browser/loader/resource_loader.cc View 1 2 3 4 5 6 7 8 9 10 11 5 chunks +8 lines, -6 lines 0 comments Download
M content/browser/loader/resource_request_info_impl.h View 1 2 3 4 5 6 7 8 9 10 3 chunks +0 lines, -10 lines 0 comments Download
M content/browser/loader/resource_request_info_impl.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -2 lines 0 comments Download
M content/browser/web_contents/web_contents_impl_unittest.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +0 lines, -1 line 0 comments Download
M content/public/browser/content_browser_client.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -2 lines 0 comments Download
M content/public/browser/content_browser_client.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +2 lines, -1 line 0 comments Download
M content/public/browser/web_contents_observer.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M content/shell/browser/shell_content_browser_client.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M content/shell/browser/shell_content_browser_client.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download

Depends on Patchset:

Messages

Total messages: 75 (46 generated)
clamy
@nasko & creis: PTAL This is the merge of CrossSiteResourceHandler & NavigationResourceThrottle that allows to ...
4 years, 3 months ago (2016-09-07 13:57:36 UTC) #6
Charlie Reis
On 2016/09/07 13:57:36, clamy wrote: > @nasko & creis: PTAL > This is the merge ...
4 years, 3 months ago (2016-09-07 23:29:06 UTC) #13
nasko
I started looking at the CL, however it will take some time to review it ...
4 years, 3 months ago (2016-09-08 00:35:36 UTC) #14
nasko
I think this CL might be easier to understand overall if we have a version ...
4 years, 3 months ago (2016-09-08 23:45:40 UTC) #15
Charlie Reis
On 2016/09/08 23:45:40, nasko (slow) wrote: > I think this CL might be easier to ...
4 years, 3 months ago (2016-09-09 05:17:14 UTC) #16
clamy
Thanks! I've also written a doc describing the changes (see link in CL description). It ...
4 years, 3 months ago (2016-09-09 15:06:42 UTC) #20
Charlie Reis
On 2016/09/09 15:06:42, clamy wrote: > Thanks! I've also written a doc describing the changes ...
4 years, 3 months ago (2016-09-09 16:49:26 UTC) #23
nasko
I've done a mostly mechanical pass and read the design doc. I'll do another pass ...
4 years, 3 months ago (2016-09-09 23:30:28 UTC) #24
clamy
Thanks! https://codereview.chromium.org/2321543002/diff/20001/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc File chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc (right): https://codereview.chromium.org/2321543002/diff/20001/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc#newcode463 chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc:463: ExtensionRegistry::Get(browser_context)->enabled_extensions(), On 2016/09/09 23:30:27, nasko (slow) wrote: > ...
4 years, 3 months ago (2016-09-12 15:31:38 UTC) #27
Charlie Reis
This is looking pretty good. I'm kind of taking it on faith (and green tests) ...
4 years, 3 months ago (2016-09-16 21:19:24 UTC) #30
clamy
On 2016/09/16 21:19:24, Charlie Reis (slow) wrote: > This is looking pretty good. I'm kind ...
4 years, 3 months ago (2016-09-20 15:57:00 UTC) #35
clamy
https://codereview.chromium.org/2321543002/diff/100001/content/browser/devtools/render_frame_devtools_agent_host.cc File content/browser/devtools/render_frame_devtools_agent_host.cc (right): https://codereview.chromium.org/2321543002/diff/100001/content/browser/devtools/render_frame_devtools_agent_host.cc#newcode565 content/browser/devtools/render_frame_devtools_agent_host.cc:565: if (!IsBrowserSideNavigationEnabled()) On 2016/09/16 21:19:25, Charlie Reis (slow) wrote: ...
4 years, 3 months ago (2016-09-20 15:57:22 UTC) #36
Charlie Reis
Thanks for the explanations! LGTM with nits. We'll want to keep an eye out for ...
4 years, 3 months ago (2016-09-21 03:31:48 UTC) #37
clamy
Thanks! I've investigated the Android issue and found the rootcause. In RenderFrameImpl, we have 2 ...
4 years, 3 months ago (2016-09-21 15:04:06 UTC) #44
clamy
@mmenke: PTAL at the changes in content/browser/loader (especially ResourceLoader) & chrome/browser/prerender @sky: PTAL at the ...
4 years, 3 months ago (2016-09-21 15:10:22 UTC) #47
sky
LGTM
4 years, 3 months ago (2016-09-21 16:25:27 UTC) #48
Charlie Reis
Hmm, I have some questions about the fix for Android, since I don't yet see ...
4 years, 3 months ago (2016-09-21 16:47:08 UTC) #49
mmenke
content/browser/loader LGTM chrome/browser/prerender LGTM I'm deferring to creis on the NavigationResourceThrottle and RDH_unittest changes. If ...
4 years, 3 months ago (2016-09-21 17:10:24 UTC) #52
Devlin
extensions lgtm
4 years, 3 months ago (2016-09-21 17:11:17 UTC) #53
clamy
Thanks! @creis: a few more clarifications about the Android interstitial issue. https://codereview.chromium.org/2321543002/diff/180001/content/browser/frame_host/render_frame_host_impl.cc File content/browser/frame_host/render_frame_host_impl.cc (right): ...
4 years, 3 months ago (2016-09-22 16:27:24 UTC) #54
nasko
Everything but the Android interstitial page handling l-g-t-m. I would like us to read a ...
4 years, 3 months ago (2016-09-22 22:44:55 UTC) #55
Charlie Reis
Thanks for the explanations! That helps, and sorry for the misunderstanding on the inter-patchset diff. ...
4 years, 3 months ago (2016-09-23 05:46:55 UTC) #56
clamy
@creis, nasko: I've created another patch at https://codereview.chromium.org/2364943002/ to create NavigationHandles for interstitials.
4 years, 3 months ago (2016-09-23 15:48:33 UTC) #57
clamy
Thanks! https://codereview.chromium.org/2321543002/diff/180001/content/browser/frame_host/navigation_handle_impl.cc File content/browser/frame_host/navigation_handle_impl.cc (right): https://codereview.chromium.org/2321543002/diff/180001/content/browser/frame_host/navigation_handle_impl.cc#newcode506 content/browser/frame_host/navigation_handle_impl.cc:506: // renderer. Instead it will persist until being ...
4 years, 2 months ago (2016-09-26 12:20:33 UTC) #60
nasko
Just a couple of nits on the rebase. https://codereview.chromium.org/2321543002/diff/220001/content/browser/frame_host/navigation_handle_impl.cc File content/browser/frame_host/navigation_handle_impl.cc (right): https://codereview.chromium.org/2321543002/diff/220001/content/browser/frame_host/navigation_handle_impl.cc#newcode672 content/browser/frame_host/navigation_handle_impl.cc:672: // ...
4 years, 2 months ago (2016-09-26 15:56:48 UTC) #63
clamy
Thanks! https://codereview.chromium.org/2321543002/diff/220001/content/browser/frame_host/navigation_handle_impl.cc File content/browser/frame_host/navigation_handle_impl.cc (right): https://codereview.chromium.org/2321543002/diff/220001/content/browser/frame_host/navigation_handle_impl.cc#newcode672 content/browser/frame_host/navigation_handle_impl.cc:672: // "cross-process" chrome:// frames, and that doesn't yet ...
4 years, 2 months ago (2016-09-27 13:43:24 UTC) #68
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2321543002/280001
4 years, 2 months ago (2016-09-27 13:43:48 UTC) #71
commit-bot: I haz the power
Committed patchset #15 (id:280001)
4 years, 2 months ago (2016-09-27 15:23:48 UTC) #73
commit-bot: I haz the power
4 years, 2 months ago (2016-09-27 15:26:21 UTC) #75
Message was sent while issue was closed.
Patchset 15 (id:??) landed as
https://crrev.com/f40a0349f8575ccd544d6844dccd56119b87170c
Cr-Commit-Position: refs/heads/master@{#421216}

Powered by Google App Engine
This is Rietveld 408576698