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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2546533007: Store the last committed origin in RenderFrameHostImpl. (Closed)
Patch Set: Rebase (and remove DCHECK) Created 4 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index f71cdd03bcf710d246d6ade462d841996e67cfb7..2d63e9f4cb18b82db7c2d45b201121990c0e2f1c 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -475,10 +475,8 @@ const GURL& RenderFrameHostImpl::GetLastCommittedURL() {
return last_committed_url();
}
-url::Origin RenderFrameHostImpl::GetLastCommittedOrigin() {
- // Origin is stored per-FTN, so it's incorrect to call for a non-current RFH.
- CHECK(this == frame_tree_node_->current_frame_host());
- return frame_tree_node_->current_origin();
+const url::Origin& RenderFrameHostImpl::GetLastCommittedOrigin() {
+ return last_committed_origin_;
}
gfx::NativeView RenderFrameHostImpl::GetNativeView() {

Powered by Google App Engine
This is Rietveld 408576698