Make channel preemption not require view contexts for hookup

content/browser/renderer_host/render_widget_host_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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 291 matching lines @@
     view_weak_.reset();
   view_ = view;
 
   // If the renderer has not yet been initialized, then the surface ID
   // namespace will be sent during initialization.
   if (view_ && renderer_initialized_) {
     Send(new ViewMsg_SetSurfaceIdNamespace(routing_id_,
                                            view_->GetSurfaceIdNamespace()));
   }
 
-  GpuSurfaceTracker::Get()->SetSurfaceHandle(
-      surface_id_, GetCompositingSurface());
-
   synthetic_gesture_controller_.reset();
 }
 
 RenderProcessHost* RenderWidgetHostImpl::GetProcess() const {
   return process_;
 }
 
 int RenderWidgetHostImpl::GetRoutingID() const {
   return routing_id_;
 }
 
 RenderWidgetHostView* RenderWidgetHostImpl::GetView() const {
   return view_;
 }
 
 RenderWidgetHostImpl* RenderWidgetHostImpl::AsRenderWidgetHostImpl() {
   return this;
 }
 
 gfx::NativeViewId RenderWidgetHostImpl::GetNativeViewId() const {
   if (view_)
     return view_->GetNativeViewId();
   return 0;
 }
 
-gfx::GLSurfaceHandle RenderWidgetHostImpl::GetCompositingSurface() {
-  if (view_)
-    return view_->GetCompositingSurface();
-  return gfx::GLSurfaceHandle();
-}
-
 void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() {
   resize_ack_pending_ = false;
   if (repaint_ack_pending_) {
     TRACE_EVENT_ASYNC_END0(
         "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this);
   }
   repaint_ack_pending_ = false;
   if (old_resize_params_)
     old_resize_params_->new_size = gfx::Size();
 }
@@ skipping 33 matching lines @@
 void RenderWidgetHostImpl::SetNeedsFlush() {
   if (view_)
     view_->OnSetNeedsFlushInput();
 }
 
 void RenderWidgetHostImpl::Init() {
   DCHECK(process_->HasConnection());
 
   renderer_initialized_ = true;
 
-  GpuSurfaceTracker::Get()->SetSurfaceHandle(
-      surface_id_, GetCompositingSurface());

[no sievers, 2015/09/23 21:53:21]

It looks to me like removing this would possibly also allow us to remove the
deferred logic to start the compositor in RenderWidget, which is for new widgets
created by the renderer (see RenderWiget::CompleteInit() and StartCompositor()).
Maybe put a TODO over there if you agree, so we can attempt this separately (it
might of course expose some other bug/race).

[piman, 2015/09/23 23:33:37]

Added a TODO and filed a bug. I thought we still relied on it, but I can't find
the code to match, so it needs investigation, and we may be able to remove.

-
   // Send the ack along with the information on placement.
   Send(new ViewMsg_CreatingNew_ACK(routing_id_));
   GetProcess()->ResumeRequestsForView(routing_id_);
 
   // If the RWHV has not yet been set, the surface ID namespace will get
   // passed down by the call to SetView().
   if (view_) {
     Send(new ViewMsg_SetSurfaceIdNamespace(routing_id_,
                                            view_->GetSurfaceIdNamespace()));
   }
@@ skipping 854 matching lines @@
   if (!is_hidden_) {
     process_->WidgetHidden();
     is_hidden_ = true;
   }
 
   // Reset this to ensure the hung renderer mechanism is working properly.
   in_flight_event_count_ = 0;
   StopHangMonitorTimeout();
 
   if (view_) {
-    GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_,
-                                               gfx::GLSurfaceHandle());
     view_->RenderProcessGone(status, exit_code);
     view_ = nullptr;  // The View should be deleted by RenderProcessGone.
     view_weak_.reset();
   }
 
   // Reconstruct the input router to ensure that it has fresh state for a new
   // renderer. Otherwise it may be stuck waiting for the old renderer to ack an
   // event. (In particular, the above call to view_->RenderProcessGone will
   // destroy the aura window, which may dispatch a synthetic mouse move.)
   input_router_.reset(new InputRouterImpl(
@@ skipping 871 matching lines @@
 }
 
 #if defined(OS_WIN)
 gfx::NativeViewAccessible
     RenderWidgetHostImpl::GetParentNativeViewAccessible() {
   return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
 }
 #endif
 
 }  // namespace content