Use kRenderClientId command line flag when starting a render process

content/renderer/render_widget.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_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 185 matching lines @@
 
 }  // namespace
 
 namespace content {
 
 // RenderWidget ---------------------------------------------------------------
 
 RenderWidget::RenderWidget(CompositorDependencies* compositor_deps,
                            blink::WebPopupType popup_type,
                            const ScreenInfo& screen_info,
+                           const cc::FrameSinkId& frame_sink_id,
                            bool swapped_out,
                            bool hidden,
                            bool never_visible)
     : routing_id_(MSG_ROUTING_NONE),
       compositor_deps_(compositor_deps),
       webwidget_internal_(nullptr),
       owner_delegate_(nullptr),
       opener_id_(MSG_ROUTING_NONE),
       next_paint_flags_(0),
       auto_resize_mode_(false),
@@ skipping 11 matching lines @@
       for_oopif_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
       text_input_flags_(0),
       can_compose_inline_(true),
       composition_range_(gfx::Range::InvalidRange()),
       popup_type_(popup_type),
       pending_window_rect_count_(0),
       screen_info_(screen_info),
       device_scale_factor_(screen_info_.device_scale_factor),
+      frame_sink_id_(frame_sink_id),
 #if defined(OS_ANDROID)
       text_field_is_dirty_(false),
 #endif
       monitor_composition_info_(false),
       popup_origin_scale_for_emulation_(0.f),
       frame_swap_message_queue_(new FrameSwapMessageQueue()),
       resizing_mode_selector_(new ResizingModeSelector()),
       has_host_context_menu_location_(false),
       has_focus_(false),
 #if defined(OS_MACOSX)
@@ skipping 31 matching lines @@
     RenderWidgetInitializedCallback render_widget_initialized) {
   CHECK(!g_create_render_widget && !g_render_widget_initialized);
   g_create_render_widget = create_render_widget;
   g_render_widget_initialized = render_widget_initialized;
 }
 
 // static
 RenderWidget* RenderWidget::Create(int32_t opener_id,
                                    CompositorDependencies* compositor_deps,
                                    blink::WebPopupType popup_type,
-                                   const ScreenInfo& screen_info) {
+                                   const ScreenInfo& screen_info,
+                                   const cc::FrameSinkId& frame_sink_id) {
   DCHECK(opener_id != MSG_ROUTING_NONE);
-  scoped_refptr<RenderWidget> widget(new RenderWidget(
-      compositor_deps, popup_type, screen_info, false, false, false));
+  scoped_refptr<RenderWidget> widget(
+      new RenderWidget(compositor_deps, popup_type, screen_info, frame_sink_id,
+                       false, false, false));
   if (widget->Init(opener_id)) {  // adds reference on success.
     return widget.get();
   }
   return NULL;
 }
 
 // static
 RenderWidget* RenderWidget::CreateForFrame(
     int routing_id,
     bool hidden,
     const ScreenInfo& screen_info,
     CompositorDependencies* compositor_deps,
-    blink::WebLocalFrame* frame) {
+    blink::WebLocalFrame* frame,
+    const cc::FrameSinkId& frame_sink_id) {
   CHECK_NE(routing_id, MSG_ROUTING_NONE);
   // TODO(avi): Before RenderViewImpl has-a RenderWidget, the browser passes the
   // same routing ID for both the view routing ID and the main frame widget
   // routing ID. https://crbug.com/545684
   RenderViewImpl* view = RenderViewImpl::FromRoutingID(routing_id);
   if (view) {
     view->AttachWebFrameWidget(
         RenderWidget::CreateWebFrameWidget(view->GetWidget(), frame));
     return view->GetWidget();
   }
   scoped_refptr<RenderWidget> widget(
       g_create_render_widget
           ? g_create_render_widget(compositor_deps, blink::WebPopupTypeNone,
-                                   screen_info, false, hidden, false)
+                                   screen_info, frame_sink_id, false, hidden,

[Fady Samuel, 2016/10/26 15:00:18]

This isn't right. Each RenderWidget should share the same client_id but get a
different sink ID equal to the routing ID.

I think we should tell a renderer process its client ID via flag when the
process is created, and when a RenderWidget gets a routing ID (via SetRoutingID)
it should get its sink ID.

+                                   false)
           : new RenderWidget(compositor_deps, blink::WebPopupTypeNone,
-                             screen_info, false, hidden, false));
+                             screen_info, frame_sink_id, false, hidden, false));
   widget->SetRoutingID(routing_id);
   widget->for_oopif_ = true;
   // DoInit increments the reference count on |widget|, keeping it alive after
   // this function returns.
   if (widget->DoInit(MSG_ROUTING_NONE,
                      RenderWidget::CreateWebFrameWidget(widget.get(), frame),
                      nullptr)) {
     if (g_render_widget_initialized)
       g_render_widget_initialized(widget.get());
     return widget.get();
@@ skipping 1765 matching lines @@
 bool RenderWidget::isPointerLocked() {
   return mouse_lock_dispatcher_->IsMouseLockedTo(
       webwidget_mouse_lock_target_.get());
 }
 
 blink::WebWidget* RenderWidget::GetWebWidget() const {
   return webwidget_internal_;
 }
 
 }  // namespace content