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

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

Issue 803803003: 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 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 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1071 // failure. 1071 // failure.
1072 DCHECK_EQ(page_id, page_id_); 1072 DCHECK_EQ(page_id, page_id_);
1073 1073
1074 // Without this check, the renderer can trick the browser into using 1074 // Without this check, the renderer can trick the browser into using
1075 // filenames it can't access in a future session restore. 1075 // filenames it can't access in a future session restore.
1076 if (!CanAccessFilesOfPageState(state)) { 1076 if (!CanAccessFilesOfPageState(state)) {
1077 GetProcess()->ReceivedBadMessage(); 1077 GetProcess()->ReceivedBadMessage();
1078 return; 1078 return;
1079 } 1079 }
1080 1080
1081 delegate_->UpdateState(this, page_id_, page_id, state); 1081 delegate_->UpdateState(this, page_id, state);
1082 } 1082 }
1083 1083
1084 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) { 1084 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) {
1085 if (is_active_) 1085 if (is_active_)
1086 delegate_->UpdateTargetURL(url); 1086 delegate_->UpdateTargetURL(url);
1087 1087
1088 // Send a notification back to the renderer that we are ready to 1088 // Send a notification back to the renderer that we are ready to
1089 // receive more target urls. 1089 // receive more target urls.
1090 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID())); 1090 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID()));
1091 } 1091 }
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 FrameTree* frame_tree = delegate_->GetFrameTree(); 1478 FrameTree* frame_tree = delegate_->GetFrameTree();
1479 1479
1480 frame_tree->ResetForMainFrameSwap(); 1480 frame_tree->ResetForMainFrameSwap();
1481 } 1481 }
1482 1482
1483 void RenderViewHostImpl::SelectWordAroundCaret() { 1483 void RenderViewHostImpl::SelectWordAroundCaret() {
1484 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1484 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1485 } 1485 }
1486 1486
1487 } // namespace content 1487 } // 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