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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 // the redirect chain. 369 // the redirect chain.
370 CHECK(transfer_url_chain.size()); 370 CHECK(transfer_url_chain.size());
371 GURL transfer_url = transfer_url_chain.back(); 371 GURL transfer_url = transfer_url_chain.back();
372 std::vector<GURL> rest_of_chain = transfer_url_chain; 372 std::vector<GURL> rest_of_chain = transfer_url_chain;
373 rest_of_chain.pop_back(); 373 rest_of_chain.pop_back();
374 374
375 // We don't know whether the original request had |user_action| set to true. 375 // We don't know whether the original request had |user_action| set to true.
376 // However, since we force the navigation to be in the current tab, it 376 // However, since we force the navigation to be in the current tab, it
377 // doesn't matter. 377 // doesn't matter.
378 pending_render_frame_host->frame_tree_node()->navigator()->RequestTransferURL( 378 pending_render_frame_host->frame_tree_node()->navigator()->RequestTransferURL(
379 pending_render_frame_host, 379 pending_render_frame_host, transfer_url, nullptr, rest_of_chain, referrer,
380 transfer_url, 380 page_transition, CURRENT_TAB, global_request_id,
381 rest_of_chain, 381 should_replace_current_entry, true);
382 referrer,
383 page_transition,
384 CURRENT_TAB,
385 global_request_id,
386 should_replace_current_entry,
387 true);
388 382
389 // The transferring request was only needed during the RequestTransferURL 383 // The transferring request was only needed during the RequestTransferURL
390 // call, so it is safe to clear at this point. 384 // call, so it is safe to clear at this point.
391 cross_site_transferring_request_.reset(); 385 cross_site_transferring_request_.reset();
392 } 386 }
393 387
394 void RenderFrameHostManager::OnDeferredAfterResponseStarted( 388 void RenderFrameHostManager::OnDeferredAfterResponseStarted(
395 const GlobalRequestID& global_request_id, 389 const GlobalRequestID& global_request_id,
396 RenderFrameHostImpl* pending_render_frame_host) { 390 RenderFrameHostImpl* pending_render_frame_host) {
397 DCHECK(!response_started_id_.get()); 391 DCHECK(!response_started_id_.get());
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 void RenderFrameHostManager::DeleteRenderFrameProxyHost( 1647 void RenderFrameHostManager::DeleteRenderFrameProxyHost(
1654 SiteInstance* instance) { 1648 SiteInstance* instance) {
1655 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); 1649 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId());
1656 if (iter != proxy_hosts_.end()) { 1650 if (iter != proxy_hosts_.end()) {
1657 delete iter->second; 1651 delete iter->second;
1658 proxy_hosts_.erase(iter); 1652 proxy_hosts_.erase(iter);
1659 } 1653 }
1660 } 1654 }
1661 1655
1662 } // namespace content 1656 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698