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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 616163002: Revert of Ensure that the browser’s copy of page id is in sync with the renderer’s. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 } 1084 }
1085 1085
1086 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) { 1086 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) {
1087 // Without this check, the renderer can trick the browser into using 1087 // Without this check, the renderer can trick the browser into using
1088 // filenames it can't access in a future session restore. 1088 // filenames it can't access in a future session restore.
1089 if (!CanAccessFilesOfPageState(state)) { 1089 if (!CanAccessFilesOfPageState(state)) {
1090 GetProcess()->ReceivedBadMessage(); 1090 GetProcess()->ReceivedBadMessage();
1091 return; 1091 return;
1092 } 1092 }
1093 1093
1094 delegate_->UpdateState(this, page_id_, page_id, state); 1094 delegate_->UpdateState(this, page_id, state);
1095 } 1095 }
1096 1096
1097 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) { 1097 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) {
1098 if (IsRVHStateActive(rvh_state_)) 1098 if (IsRVHStateActive(rvh_state_))
1099 delegate_->UpdateTargetURL(url); 1099 delegate_->UpdateTargetURL(url);
1100 1100
1101 // Send a notification back to the renderer that we are ready to 1101 // Send a notification back to the renderer that we are ready to
1102 // receive more target urls. 1102 // receive more target urls.
1103 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID())); 1103 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID()));
1104 } 1104 }
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 FrameTree* frame_tree = delegate_->GetFrameTree(); 1508 FrameTree* frame_tree = delegate_->GetFrameTree();
1509 1509
1510 frame_tree->ResetForMainFrameSwap(); 1510 frame_tree->ResetForMainFrameSwap();
1511 } 1511 }
1512 1512
1513 void RenderViewHostImpl::SelectWordAroundCaret() { 1513 void RenderViewHostImpl::SelectWordAroundCaret() {
1514 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1514 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1515 } 1515 }
1516 1516
1517 } // namespace content 1517 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698