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

Unified Diff: content/renderer/history_entry.cc

Issue 1142123002: Remove swapped-out usage in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another round of fixes. 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/history_entry.cc
diff --git a/content/renderer/history_entry.cc b/content/renderer/history_entry.cc
index efd6fb54682e43d22d18aab7eaa5a9adcf0b9ead..24d6aea412fd68088379da83f235a1d24513adfb 100644
--- a/content/renderer/history_entry.cc
+++ b/content/renderer/history_entry.cc
@@ -69,7 +69,10 @@ HistoryEntry::HistoryNode* HistoryEntry::HistoryNode::CloneAndReplace(
item_.documentSequenceNumber());
}
- if (clone_children_of_target || !is_target_frame) {
+ // TODO(creis): This needs to be updated to handle HistoryEntry in
+ // subframe processes, where the main frame isn't guaranteed to be in the
+ // same process.
+ if (current_frame && (clone_children_of_target || !is_target_frame)) {
for (WebFrame* child = current_frame->GetWebFrame()->firstChild(); child;
child = child->nextSibling()) {
RenderFrameImpl* child_render_frame =
« no previous file with comments | « content/renderer/accessibility/renderer_accessibility_browsertest.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698