Pass origin information for remote frame creation.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 748 matching lines @@
       command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
 
   RenderFrameProxy* proxy = NULL;
   if (params->proxy_routing_id != MSG_ROUTING_NONE) {
     CHECK(params->swapped_out);
     proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
         main_render_frame_.get(), params->proxy_routing_id);
     main_render_frame_->set_render_frame_proxy(proxy);
   }
 
+  bool is_site_per_process =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess);
+
   // In --site-per-process, just use the WebRemoteFrame as the main frame.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) &&
-      proxy) {
+  if (is_site_per_process && proxy) {
     webview()->setMainFrame(proxy->web_frame());
   } else {
     webview()->setMainFrame(main_render_frame_->GetWebFrame());
   }
   main_render_frame_->Initialize();
 
+  // In --site-per-process, initialize the WebRemoteFrame with information

[dcheng, 2014/11/19 00:50:11]

Any chance we can combine this if block with the above one?

[alexmos, 2014/11/19 02:49:27]

Done.

+  // replicated from the browser process.
+  if (is_site_per_process && proxy) {
+    RenderFrameImpl::SetReplicatedState(proxy->web_frame(),
+                                        params->remote_frame_state);
+  }
+
   if (switches::IsTouchDragDropEnabled())
     webview()->settings()->setTouchDragDropEnabled(true);
 
   if (switches::IsTouchEditingEnabled())
     webview()->settings()->setTouchEditingEnabled(true);
 
   if (!params->frame_name.empty())
     webview()->mainFrame()->setName(params->frame_name);
 
   // TODO(davidben): Move this state from Blink into content.
@@ skipping 343 matching lines @@
     bool window_was_created_with_opener,
     const RendererPreferences& renderer_prefs,
     const WebPreferences& webkit_prefs,
     int32 routing_id,
     int32 main_frame_routing_id,
     int32 surface_id,
     int64 session_storage_namespace_id,
     const base::string16& frame_name,
     bool is_renderer_created,
     bool swapped_out,
+    const FrameReplicationState& remote_frame_state,
     int32 proxy_routing_id,
     bool hidden,
     bool never_visible,
     int32 next_page_id,
     const blink::WebScreenInfo& screen_info) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
   RenderViewImplParams params(opener_id,
                               window_was_created_with_opener,
                               renderer_prefs,
                               webkit_prefs,
                               routing_id,
                               main_frame_routing_id,
                               surface_id,
                               session_storage_namespace_id,
                               frame_name,
                               is_renderer_created,
                               swapped_out,
+                              remote_frame_state,
                               proxy_routing_id,
                               hidden,
                               never_visible,
                               next_page_id,
                               screen_info);
   RenderViewImpl* render_view = NULL;
   if (g_create_render_view_impl)
     render_view = g_create_render_view_impl(&params);
   else
     render_view = new RenderViewImpl(&params);
@@ skipping 514 matching lines @@
       true,  // window_was_created_with_opener
       renderer_preferences_,
       webkit_preferences_,
       routing_id,
       main_frame_routing_id,
       surface_id,
       cloned_session_storage_namespace_id,
       base::string16(),  // WebCore will take care of setting the correct name.
       true,              // is_renderer_created
       false,             // swapped_out
+      FrameReplicationState(),  // Empty since swapped_out is false.
       MSG_ROUTING_NONE,  // proxy_routing_id
       params.disposition == NEW_BACKGROUND_TAB,  // hidden
       never_visible,
       1,  // next_page_id
       screen_info_);
   view->opened_by_user_gesture_ = params.user_gesture;
 
   // Record whether the creator frame is trying to suppress the opener field.
   view->opener_suppressed_ = params.opener_suppressed;
 
@@ skipping 2518 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content