Added plumbing to transport the frame name between RenderViewHost and the Webkit layer.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 480 matching lines @@
 
 /*static*/
 RenderView* RenderView::Create(
     RenderThreadBase* render_thread,
     gfx::NativeViewId parent_hwnd,
     int32 opener_id,
     const RendererPreferences& renderer_prefs,
     const WebPreferences& webkit_prefs,
     SharedRenderViewCounter* counter,
     int32 routing_id,
-    int64 session_storage_namespace_id) {
+    int64 session_storage_namespace_id,
+    const string16& frame_name) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
   scoped_refptr<RenderView> view = new RenderView(render_thread, webkit_prefs,
                                                   session_storage_namespace_id);
   view->Init(parent_hwnd,
              opener_id,
              renderer_prefs,
              counter,
-             routing_id);  // adds reference
+             routing_id,
+             frame_name);  // adds reference
   return view;
 }
 
 /*static*/
 void RenderView::SetNextPageID(int32 next_page_id) {
   // This method should only be called during process startup, and the given
   // page id had better not exceed our current next page id!
   DCHECK_EQ(next_page_id_, 1);
   DCHECK(next_page_id >= next_page_id_);
   next_page_id_ = next_page_id;
@@ skipping 14 matching lines @@
 
 void RenderView::UnregisterPluginDelegate(WebPluginDelegateProxy* delegate) {
   plugin_delegates_.erase(delegate);
 }
 #endif
 
 void RenderView::Init(gfx::NativeViewId parent_hwnd,
                       int32 opener_id,
                       const RendererPreferences& renderer_prefs,
                       SharedRenderViewCounter* counter,
-                      int32 routing_id) {
+                      int32 routing_id,
+                      const string16& frame_name) {
   DCHECK(!webview());
 
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
   if (counter) {
     shared_popup_counter_ = counter;
     shared_popup_counter_->data++;
     decrement_shared_popup_at_destruction_ = true;
   } else {
     shared_popup_counter_ = new SharedRenderViewCounter(0);
     decrement_shared_popup_at_destruction_ = false;
   }
 
   devtools_agent_.reset(new DevToolsAgent(routing_id, this));
 
   webwidget_ = WebView::create(this);
   Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
+  // TODO(atwilson): Enable this when setName() becomes available upstream.
+  // if (!frame_name.empty)
+  //   webview()->mainFrame()->setName(frame_name);
   webview()->setDevToolsAgent(
       WebDevToolsAgent::create(webview(), devtools_agent_.get()));
 
   OnSetRendererPrefs(renderer_prefs);
 
   routing_id_ = routing_id;
   render_thread_->AddRoute(routing_id_, this);
   // Take a reference on behalf of the RenderThread.  This will be balanced
   // when we receive ViewMsg_Close.
   AddRef();
@@ skipping 1005 matching lines @@
 #else
   // TODO(port): Implement the infobar that accompanies the default plugin.
   // Linux: http://crbug.com/10952
   // Mac: http://crbug.com/17392
   NOTIMPLEMENTED();
 #endif
 }
 
 // WebKit::WebViewClient ------------------------------------------------------
 
+// TODO(atwilson): Remove this older API when we've pushed the related changes
+// upstream.
 WebView* RenderView::createView(
     WebFrame* creator,
     const WebWindowFeatures& features) {
+  return createView(creator, features, WebString());
+}
+
+WebView* RenderView::createView(
+    WebFrame* creator,
+    const WebWindowFeatures& features,
+    const WebString& frame_name) {
   // Check to make sure we aren't overloading on popups.
   if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups)
     return NULL;
 
   // This window can't be closed from a window.close() call until we receive a
   // message from the Browser process explicitly allowing it.
   script_can_close_ = false;
 
+  ViewHostMsg_CreateWindow_Params params;
+  params.opener_id = routing_id_;
+  params.user_gesture = creator->isProcessingUserGesture();
+  params.window_container_type = WindowFeaturesToContainerType(features);
+  params.session_storage_namespace_id = session_storage_namespace_id_;
+  params.frame_name = frame_name;
+
   int32 routing_id = MSG_ROUTING_NONE;
-  bool user_gesture = creator->isProcessingUserGesture();
+  int64 cloned_session_storage_namespace_id;
   bool opener_suppressed = creator->willSuppressOpenerInNewFrame();
-  int64 cloned_session_storage_namespace_id;
 
   render_thread_->Send(
-      new ViewHostMsg_CreateWindow(
-          routing_id_,
-          user_gesture,
-          WindowFeaturesToContainerType(features),
-          session_storage_namespace_id_,
-          &routing_id,
-          &cloned_session_storage_namespace_id));
+      new ViewHostMsg_CreateWindow(params,
+                                   &routing_id,
+                                   &cloned_session_storage_namespace_id));
   if (routing_id == MSG_ROUTING_NONE)
     return NULL;
 
   RenderView* view = RenderView::Create(render_thread_,
                                         0,
                                         routing_id_,
                                         renderer_preferences_,
                                         webkit_preferences_,
                                         shared_popup_counter_,
                                         routing_id,
-                                        cloned_session_storage_namespace_id);
-  view->opened_by_user_gesture_ = user_gesture;
+                                        cloned_session_storage_namespace_id,
+                                        frame_name);
+  view->opened_by_user_gesture_ = params.user_gesture;
 
   // Record whether the creator frame is trying to suppress the opener field.
   view->opener_suppressed_ = opener_suppressed;
 
   // Record the security origin of the creator.
   GURL creator_url(creator->securityOrigin().toString().utf8());
   if (!creator_url.is_valid() || !creator_url.IsStandard())
     creator_url = GURL();
   view->creator_url_ = creator_url;
 
@@ skipping 3464 matching lines @@
   webkit_glue::FormData form;
   const WebInputElement element = node.toConst<WebInputElement>();
   if (!form_manager_.FindFormWithFormControlElement(
           element, FormManager::REQUIRE_NONE, &form))
     return;
 
   autofill_action_ = action;
   Send(new ViewHostMsg_FillAutoFillFormData(
       routing_id_, autofill_query_id_, form, value, label));
 }