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

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

Issue 1425293006: Move nav_entry_id from RenderViewHost to RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initial patch Created 5 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_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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 frame_tree_(frame_tree), 184 frame_tree_(frame_tree),
185 frame_tree_node_(frame_tree_node), 185 frame_tree_node_(frame_tree_node),
186 render_widget_host_(nullptr), 186 render_widget_host_(nullptr),
187 routing_id_(routing_id), 187 routing_id_(routing_id),
188 render_frame_created_(false), 188 render_frame_created_(false),
189 navigations_suspended_(false), 189 navigations_suspended_(false),
190 is_waiting_for_beforeunload_ack_(false), 190 is_waiting_for_beforeunload_ack_(false),
191 unload_ack_is_for_navigation_(false), 191 unload_ack_is_for_navigation_(false),
192 is_loading_(false), 192 is_loading_(false),
193 pending_commit_(false), 193 pending_commit_(false),
194 nav_entry_id_(0),
194 accessibility_reset_token_(0), 195 accessibility_reset_token_(0),
195 accessibility_reset_count_(0), 196 accessibility_reset_count_(0),
196 no_create_browser_accessibility_manager_for_testing_(false), 197 no_create_browser_accessibility_manager_for_testing_(false),
197 weak_ptr_factory_(this) { 198 weak_ptr_factory_(this) {
198 bool is_swapped_out = !!(flags & CREATE_RF_SWAPPED_OUT); 199 bool is_swapped_out = !!(flags & CREATE_RF_SWAPPED_OUT);
199 bool hidden = !!(flags & CREATE_RF_HIDDEN); 200 bool hidden = !!(flags & CREATE_RF_HIDDEN);
200 frame_tree_->AddRenderViewHostRef(render_view_host_); 201 frame_tree_->AddRenderViewHostRef(render_view_host_);
201 GetProcess()->AddRoute(routing_id_, this); 202 GetProcess()->AddRoute(routing_id_, this);
202 g_routing_id_frame_map.Get().insert(std::make_pair( 203 g_routing_id_frame_map.Get().insert(std::make_pair(
203 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 204 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
(...skipping 2102 matching lines...) Expand 10 before | Expand all | Expand 10 after
2306 *dst = src; 2307 *dst = src;
2307 2308
2308 if (src.routing_id != -1) 2309 if (src.routing_id != -1)
2309 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2310 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2310 2311
2311 if (src.parent_routing_id != -1) 2312 if (src.parent_routing_id != -1)
2312 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2313 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2313 } 2314 }
2314 2315
2315 } // namespace content 2316 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/renderer_host/render_view_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698