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 1096 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();
+  int32_t client_id = 0;
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[Fady Samuel, 2016/10/28 18:14:40]

DCHECK that we have the switch.

[Alex Z., 2016/10/28 18:36:11]

Done.

+          switches::kRendererClientId))
+    client_id =
+        std::stoi(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

[Fady Samuel, 2016/10/28 18:14:40]

Use base::StringToInt
https://cs.chromium.org/chromium/src/base/strings/string_number_conversions.h...

[Alex Z., 2016/10/28 18:36:11]

Done.

+            switches::kRendererClientId));
+  compositor_->SetFrameSinkId(cc::FrameSinkId(client_id, routing_id_));
 }
 
 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 374 matching lines @@
 }
 
 void RenderWidget::OnUpdateWindowScreenRect(
     const gfx::Rect& window_screen_rect) {
   if (screen_metrics_emulator_)
     screen_metrics_emulator_->OnUpdateWindowScreenRect(window_screen_rect);
   else
     window_screen_rect_ = window_screen_rect;
 }
 
 void RenderWidget::OnSetFrameSinkId(const cc::FrameSinkId& frame_sink_id) {

[Fady Samuel, 2016/10/28 18:14:40]

delete this and the existing IPC. We don't need it.

[Alex Z., 2016/10/28 18:36:11]

Done.

   if (compositor_)
     compositor_->SetFrameSinkId(frame_sink_id);
 }
 
 void RenderWidget::OnHandleCompositorProto(const std::vector<uint8_t>& proto) {
   if (compositor_)
     compositor_->OnHandleCompositorProto(proto);
 }
 
 void RenderWidget::showImeIfNeeded() {
@@ skipping 566 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