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 229 matching lines @@
       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)
       text_input_client_observer_(new TextInputClientObserver(this)),
 #endif
       focused_pepper_plugin_(nullptr) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[Fady Samuel, 2016/10/27 20:15:55]

I see no point in saving this here. 

[Alex Z., 2016/10/28 18:09:47]

Done.

+          switches::kRendererClientId)) {
+    std::string client_id_str =
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+            switches::kRendererClientId);
+    client_id_ = std::stoi(client_id_str);
+  }
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
   DCHECK(RenderThread::Get());
   device_color_profile_.push_back('0');
 #if defined(OS_ANDROID)
   text_input_info_history_.push_back(blink::WebTextInputInfo());
 #endif
 
   // In tests there may not be a RenderThreadImpl.
   if (RenderThreadImpl::current()) {
@@ skipping 98 matching lines @@
 }
 
 void RenderWidget::CloseForFrame() {
   OnClose();
 }
 
 void RenderWidget::SetRoutingID(int32_t routing_id) {
   routing_id_ = routing_id;
   input_handler_.reset(new RenderWidgetInputHandler(
       GetRenderWidgetInputHandlerDelegate(this), this));
+
+  OnSetFrameSinkId(cc::FrameSinkId(client_id_, routing_id_));

[Fady Samuel, 2016/10/27 20:15:55]

I don't believe we have a RenderWidgetCompositor yet at this point. We should
just get rid of OnSetFrameSinkId and the chrome IPC.

[Alex Z., 2016/10/28 18:09:47]

Done.

 }
 
 void RenderWidget::SetSwappedOut(bool is_swapped_out) {
   // We should only toggle between states.
   DCHECK(is_swapped_out_ != is_swapped_out);
   is_swapped_out_ = is_swapped_out;
 
   // If we are swapping out, we will call ReleaseProcess, allowing the process
   // to exit if all of its RenderViews are swapped out.  We wait until the
   // WasSwappedOut call to do this, to allow the unload handler to finish.
@@ skipping 116 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_EnableDeviceEmulation,
                         OnEnableDeviceEmulation)
     IPC_MESSAGE_HANDLER(ViewMsg_DisableDeviceEmulation,
                         OnDisableDeviceEmulation)
     IPC_MESSAGE_HANDLER(ViewMsg_WasHidden, OnWasHidden)
     IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown)
     IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint)
     IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection)
     IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects)
     IPC_MESSAGE_HANDLER(ViewMsg_SetFrameSinkId, OnSetFrameSinkId)

[Fady Samuel, 2016/10/27 20:15:55]

Get rid of this.

[Alex Z., 2016/10/28 18:09:47]

Done.

     IPC_MESSAGE_HANDLER(ViewMsg_WaitForNextFrameForTests,
                         OnWaitNextFrameForTests)
     IPC_MESSAGE_HANDLER(InputMsg_RequestCompositionUpdate,
                         OnRequestCompositionUpdate)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(InputMsg_ImeEventAck, OnImeEventAck)
     IPC_MESSAGE_HANDLER(InputMsg_RequestTextInputStateUpdate,
                         OnRequestTextInputStateUpdate)
     IPC_MESSAGE_HANDLER(InputMsg_ImeBatchEdit,
                         OnImeBatchEdit)
@@ skipping 592 matching lines @@
                                                compositor_deps_);
   compositor_->setViewportSize(physical_backing_size_);
   OnDeviceScaleFactorChanged();
   compositor_->SetDeviceColorSpace(screen_info_.icc_profile.GetColorSpace());
   // For background pages and certain tests, we don't want to trigger
   // CompositorFrameSink creation.
   if (compositor_never_visible_ || !RenderThreadImpl::current())
     compositor_->SetNeverVisible();
 
   StartCompositor();
+  compositor_->SetFrameSinkId(cc::FrameSinkId(client_id_, routing_id_));

[Fady Samuel, 2016/10/27 20:15:55]

We can simply read the client id from commandline here.

[Alex Z., 2016/10/28 18:09:47]

Done.

 }
 
 void RenderWidget::WillCloseLayerTreeView() {
   if (host_closing_)
     return;
 
   // Prevent new compositors or output surfaces from being created.
   host_closing_ = true;
 
   // Always send this notification to prevent new layer tree views from
@@ skipping 961 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