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

Issue 2397893002: Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle. (Closed)

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

Description

Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle. The merge between those two objects was done over more than one CL. The goal of this CL is to revert all of the code at once, so it can be easily relanded once the branch cut happens. This CL reverts the following two: Revert "Merge CrossSiteResourceHandler and NavigationResourceThrottle" This reverts commit f40a0349f8575ccd544d6844dccd56119b87170c. Revert "Prevent RFH from attempting to transfer after it's been swapped out" This reverts commit 152381c57c5c04d07b9ebb2496e369ba239a98f7. BUG=621856, 651503 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation R=creis@chromium.org TBR=sky@chromium.org Committed: https://chromium.googlesource.com/chromium/src/+/42ac3af0382dff192c3bc9f90f37a3982822bbb0

Patch Set 1 #

Total comments: 1

Patch Set 2 : Add back initialization of started_from_context_menu_. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+824 lines, -451 lines) Patch
M chrome/browser/chrome_content_browser_client.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chrome_content_browser_client.cc View 1 chunk +2 lines, -3 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 1 chunk +3 lines, -2 lines 0 comments Download
M chrome/browser/prerender/prerender_browsertest.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/browser_browsertest.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/test/data/extensions/api_test/webnavigation/crossProcessAbort/test_crossProcessAbort.js View 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/BUILD.gn View 2 chunks +4 lines, -0 lines 0 comments Download
M content/browser/devtools/render_frame_devtools_agent_host.cc View 1 chunk +2 lines, -5 lines 0 comments Download
A content/browser/frame_host/cross_site_transferring_request.h View 1 chunk +42 lines, -0 lines 0 comments Download
A content/browser/frame_host/cross_site_transferring_request.cc View 1 chunk +46 lines, -0 lines 0 comments Download
M content/browser/frame_host/navigation_controller_impl_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M content/browser/frame_host/navigation_handle_impl.h View 7 chunks +1 line, -57 lines 0 comments Download
M content/browser/frame_host/navigation_handle_impl.cc View 1 11 chunks +13 lines, -132 lines 0 comments Download
M content/browser/frame_host/navigation_handle_impl_unittest.cc View 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/frame_host/navigation_request.cc View 1 chunk +0 lines, -4 lines 0 comments Download
M content/browser/frame_host/navigator_impl.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M content/browser/frame_host/render_frame_host_impl.h View 2 chunks +13 lines, -0 lines 0 comments Download
M content/browser/frame_host/render_frame_host_impl.cc View 3 chunks +17 lines, -0 lines 0 comments Download
M content/browser/frame_host/render_frame_host_manager.h View 3 chunks +11 lines, -0 lines 0 comments Download
M content/browser/frame_host/render_frame_host_manager.cc View 8 chunks +38 lines, -29 lines 0 comments Download
M content/browser/frame_host/render_frame_host_manager_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
A content/browser/loader/cross_site_resource_handler.h View 1 chunk +97 lines, -0 lines 0 comments Download
A content/browser/loader/cross_site_resource_handler.cc View 1 chunk +388 lines, -0 lines 0 comments Download
M content/browser/loader/navigation_resource_throttle.h View 1 chunk +0 lines, -11 lines 0 comments Download
M content/browser/loader/navigation_resource_throttle.cc View 10 chunks +2 lines, -62 lines 0 comments Download
M content/browser/loader/resource_dispatcher_host_impl.h View 1 chunk +1 line, -1 line 0 comments Download
M content/browser/loader/resource_dispatcher_host_impl.cc View 4 chunks +28 lines, -2 lines 0 comments Download
M content/browser/loader/resource_dispatcher_host_unittest.cc View 18 chunks +66 lines, -7 lines 0 comments Download
M content/browser/loader/resource_loader.h View 2 chunks +1 line, -4 lines 0 comments Download
M content/browser/loader/resource_loader.cc View 5 chunks +6 lines, -8 lines 0 comments Download
M content/browser/loader/resource_request_info_impl.h View 3 chunks +10 lines, -0 lines 0 comments Download
M content/browser/loader/resource_request_info_impl.cc View 1 chunk +2 lines, -1 line 0 comments Download
M content/browser/site_per_process_browsertest.cc View 1 chunk +0 lines, -37 lines 0 comments Download
M content/browser/web_contents/web_contents_impl_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M content/public/browser/content_browser_client.h View 1 chunk +2 lines, -1 line 0 comments Download
M content/public/browser/content_browser_client.cc View 1 chunk +1 line, -2 lines 0 comments Download
M content/public/browser/web_contents_observer.h View 1 chunk +1 line, -1 line 0 comments Download
M content/public/test/browser_test_utils.h View 2 chunks +1 line, -11 lines 0 comments Download
M content/public/test/browser_test_utils.cc View 8 chunks +11 lines, -62 lines 0 comments Download
M content/shell/browser/shell_content_browser_client.h View 1 chunk +1 line, -1 line 0 comments Download
M content/shell/browser/shell_content_browser_client.cc View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 15 (11 generated)
nasko
Hey Charlie and Scott, Can you review the revert of the CSRH removal work? Thanks ...
4 years, 2 months ago (2016-10-05 20:55:00 UTC) #5
Charlie Reis
[+clamy for FYI] LGTM, thanks! We should be able to revert this CL right after ...
4 years, 2 months ago (2016-10-05 22:29:34 UTC) #9
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/42ac3af0382dff192c3bc9f90f37a3982822bbb0 Cr-Commit-Position: refs/heads/master@{#423343}
4 years, 2 months ago (2016-10-05 23:55:17 UTC) #13
nasko
4 years, 2 months ago (2016-10-05 23:56:19 UTC) #15
Message was sent while issue was closed.
Committed patchset #2 (id:20001) manually as
42ac3af0382dff192c3bc9f90f37a3982822bbb0 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698