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 = |