Remove swapped-out usage in --site-per-process.

content/renderer/history_entry.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 51 matching lines @@
     RenderFrameImpl* current_frame) {
   bool is_target_frame = target_frame == current_frame;
   const WebHistoryItem& item_for_create = is_target_frame ? new_item : item_;
   HistoryNode* new_history_node = new HistoryNode(new_entry, item_for_create);
 
   if (is_target_frame && clone_children_of_target && !item_.isNull()) {
     new_history_node->item().setDocumentSequenceNumber(
         item_.documentSequenceNumber());
   }
 
-  if (clone_children_of_target || !is_target_frame) {
+  if (current_frame && (clone_children_of_target || !is_target_frame)) {

[Charlie Reis, 2015/06/04 00:02:11]

Hmm.  I suppose this is needed for OOPIFs, but it doesn't really make sense.  I
guess we'll have to revisit this as well for the session history work, and not
just GoToEntry.  Maybe add a TODO to handle HistoryEntries in subframe
processes?

[nasko, 2015/06/04 14:57:13]

This is the one I wasn't really sure how it needs to be handled. If we don't
handle, we just crash, which isn't really good either :). It is my understanding
that most of this you are moving over to the browser process. Would that work
account for this case?
Added a TODO to ensure we keep track of this.

[Charlie Reis, 2015/06/04 22:27:31]

It's beyond what I've considered so far, but probably.  I've only gotten to the
GoToEntry stuff, but Blink still needs some notion of the current HistoryEntry,
so some of it is going to stick around.
Thanks.

[nasko, 2015/06/04 23:38:36]

Acknowledged.

     for (WebFrame* child = current_frame->GetWebFrame()->firstChild(); child;
          child = child->nextSibling()) {
       RenderFrameImpl* child_render_frame =
           RenderFrameImpl::FromWebFrame(child);
       // TODO(creis): A child frame may be a RenderFrameProxy.  We should still
       // process its children, but that will be possible when we move this code
       // to the browser process in https://crbug.com/236848.
       if (!child_render_frame)
         continue;
       HistoryNode* child_history_node =
@@ skipping 73 matching lines @@
   return unique_names_to_items_[frame->GetWebFrame()->uniqueName().utf8()];
 }
 
 WebHistoryItem HistoryEntry::GetItemForFrame(RenderFrameImpl* frame) {
   if (HistoryNode* history_node = GetHistoryNodeForFrame(frame))
     return history_node->item();
   return WebHistoryItem();
 }
 
 }  // namespace content