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

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

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months 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_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 // notification containing parameters identifying the navigation. 790 // notification containing parameters identifying the navigation.
791 // 791 //
792 // Subframes are identified by the page transition type. For subframes loaded 792 // Subframes are identified by the page transition type. For subframes loaded
793 // as part of a wider page load, the page_id will be the same as for the top 793 // as part of a wider page load, the page_id will be the same as for the top
794 // level frame. If the user explicitly requests a subframe navigation, we will 794 // level frame. If the user explicitly requests a subframe navigation, we will
795 // get a new page_id because we need to create a new navigation entry for that 795 // get a new page_id because we need to create a new navigation entry for that
796 // action. 796 // action.
797 void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) { 797 void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {
798 // Read the parameters out of the IPC message directly to avoid making another 798 // Read the parameters out of the IPC message directly to avoid making another
799 // copy when we filter the URLs. 799 // copy when we filter the URLs.
800 PickleIterator iter(msg); 800 base::PickleIterator iter(msg);
801 FrameHostMsg_DidCommitProvisionalLoad_Params validated_params; 801 FrameHostMsg_DidCommitProvisionalLoad_Params validated_params;
802 if (!IPC::ParamTraits<FrameHostMsg_DidCommitProvisionalLoad_Params>:: 802 if (!IPC::ParamTraits<FrameHostMsg_DidCommitProvisionalLoad_Params>::
803 Read(&msg, &iter, &validated_params)) 803 Read(&msg, &iter, &validated_params))
804 return; 804 return;
805 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OnDidCommitProvisionalLoad", 805 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OnDidCommitProvisionalLoad",
806 "url", validated_params.url.possibly_invalid_spec()); 806 "url", validated_params.url.possibly_invalid_spec());
807 807
808 // If we're waiting for a cross-site beforeunload ack from this renderer and 808 // If we're waiting for a cross-site beforeunload ack from this renderer and
809 // we receive a Navigate message from the main frame, then the renderer was 809 // we receive a Navigate message from the main frame, then the renderer was
810 // navigating already and sent it before hearing the FrameMsg_Stop message. 810 // navigating already and sent it before hearing the FrameMsg_Stop message.
(...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after
2077 // We may be returning to an existing NavigationEntry that had been granted 2077 // We may be returning to an existing NavigationEntry that had been granted
2078 // file access. If this is a different process, we will need to grant the 2078 // file access. If this is a different process, we will need to grant the
2079 // access again. The files listed in the page state are validated when they 2079 // access again. The files listed in the page state are validated when they
2080 // are received from the renderer to prevent abuse. 2080 // are received from the renderer to prevent abuse.
2081 if (request_params.page_state.IsValid()) { 2081 if (request_params.page_state.IsValid()) {
2082 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); 2082 render_view_host_->GrantFileAccessFromPageState(request_params.page_state);
2083 } 2083 }
2084 } 2084 }
2085 2085
2086 } // namespace content 2086 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/download/base_file.cc ('k') | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698