OOPIF: History navigations for new child frames.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 2517 matching lines @@
     render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(),
                                                    GetRoutingID(),
                                                    request.url(), referrer,
                                                    suggested_name));
   } else {
     OpenURL(request.url(), referrer, policy, should_replace_current_entry);
   }
 }
 
 blink::WebHistoryItem RenderFrameImpl::historyItemForNewChildFrame(
-    blink::WebFrame* frame) {
-  DCHECK(!frame_ || frame_ == frame);
+    bool* should_load_request) {
 
-  // TODO(creis): In OOPIF enabled modes, send an IPC to the browser process
-  // telling it to navigate the new frame.  See https://crbug.com/502317.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+  // In OOPIF enabled modes, send an IPC to the browser process telling it to
+  // navigate the new frame.
+  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
+    std::string unique_name = frame_->uniqueName().utf8();
+    // TODO(creis): Have the browser tell the renderer process which names it
+    // has history items for.  In that case, set should_load_request to true and
+    // return an empty WebHistoryItem so that Blink loads the default.
+    // See https://crbug.com/502317.
+    *should_load_request = false;
+    Send(new FrameHostMsg_NavigateNewChildFrame(routing_id_, unique_name));
     return WebHistoryItem();
+  }
 
+  *should_load_request = true;
   return render_view_->history_controller()->GetItemForNewChildFrame(this);
 }
 
 void RenderFrameImpl::willSendSubmitEvent(blink::WebLocalFrame* frame,
                                           const blink::WebFormElement& form) {
   DCHECK(!frame_ || frame_ == frame);
 
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WillSendSubmitEvent(form));
 }
 
@@ skipping 2207 matching lines @@
           // store the relevant frame's WebHistoryItem in the root of the
           // PageState.
           SetPendingNavigationParams(navigation_params.Pass());
           blink::WebHistoryItem history_item = entry->root();
           blink::WebHistoryLoadType load_type =
               request_params.is_same_document_history_load
                   ? blink::WebHistorySameDocumentLoad
                   : blink::WebHistoryDifferentDocumentLoad;
 
           // Navigate the frame directly.
+          // TODO(creis): Use InitialHistoryLoad rather than BackForward for a
+          // history navigation in a newly created subframe.
           WebURLRequest request =
               frame_->requestFromHistoryItem(history_item, cache_policy);
           frame_->load(request, blink::WebFrameLoadType::BackForward,
                        history_item, load_type);
         }
       } else {
         // TODO(clamy): this should be set to the HistoryItem sent by the
         // browser once the HistoryController has moved to the browser.
         // TODO(clamy): distinguish between different document and same document
         // loads.
@@ skipping 577 matching lines @@
       media::ConvertToSwitchOutputDeviceCB(web_callbacks);
   scoped_refptr<media::AudioOutputDevice> device =
       AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
                                           security_origin);
   media::OutputDeviceStatus status = device->GetDeviceStatus();
   device->Stop();
   callback.Run(status);
 }
 
 }  // namespace content