Chromium side of merge 40314:40364.

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1611 matching lines @@
   // The following code was pulled from WebFrame.mm:_loadURL, with minor
   // modifications.  The purpose is to ensure we load the right HistoryItem for
   // this child frame.
   HistoryItem* parent_item = frame_->loader()->currentHistoryItem();
   FrameLoadType load_type = frame_->loader()->loadType();
   FrameLoadType child_load_type = WebCore::FrameLoadTypeRedirectWithLockedHistory;
   KURL new_url = request.resourceRequest().url();
 
   // If we're moving in the backforward list, we might want to replace the
   // content of this child frame with whatever was there at that point.
-  // Reload will maintain the frame contents, LoadSame will not.
   if (parent_item && parent_item->children().size() != 0 &&
-      (isBackForwardLoadType(load_type) ||
-       load_type == WebCore::FrameLoadTypeReloadAllowingStaleData)) {
+      isBackForwardLoadType(load_type)) {
     HistoryItem* child_item = parent_item->childItemWithName(request.frameName());
     if (child_item) {
       // Use the original URL to ensure we get all the side-effects, such as
       // onLoad handlers, of any redirects that happened. An example of where
       // this is needed is Radar 3213556.
       new_url = child_item->originalURL();
-
-      // These behaviors implied by these loadTypes should apply to the child
-      // frames
       child_load_type = load_type;
-
-      if (isBackForwardLoadType(load_type)) {
-        // For back/forward, remember this item so we can traverse any child
-        // items as child frames load.
-        child_frame->loader()->setProvisionalHistoryItem(child_item);
-      } else {
-        // For reload, just reinstall the current item, since a new child frame
-        // was created but we won't be creating a new BF item
-        child_frame->loader()->setCurrentHistoryItem(child_item);
-      }
+      child_frame->loader()->setProvisionalHistoryItem(child_item);
     }
   }
 
   child_frame->loader()->loadURL(new_url,
                                  request.resourceRequest().httpReferrer(),
                                  child_frame->tree()->name(),
                                  child_load_type, 0, 0);
 
   // A synchronous navigation (about:blank) would have already processed
   // onload, so it is possible for the frame to have already been destroyed by
@@ skipping 172 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }