Index: content/browser/renderer_host/render_widget_host_impl.cc |
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
index 2335a60fa9e27504129300f8935b3a8e6eef7961..925ca787cc2d5b7a76e8d779c0a422158e38991f 100644 |
--- a/content/browser/renderer_host/render_widget_host_impl.cc |
+++ b/content/browser/renderer_host/render_widget_host_impl.cc |
@@ -341,12 +341,6 @@ void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) { |
view_.reset(); |
} |
- // 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_SetFrameSinkId(routing_id_, view_->GetFrameSinkId())); |
- } |
- |
synthetic_gesture_controller_.reset(); |
} |
@@ -413,12 +407,6 @@ void RenderWidgetHostImpl::Init() { |
renderer_initialized_ = true; |
- // 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_SetFrameSinkId(routing_id_, view_->GetFrameSinkId())); |
- } |
- |
SendScreenRects(); |
WasResized(); |
@@ -1906,12 +1894,16 @@ void RenderWidgetHostImpl::IncrementInFlightEventCount( |
} |
} |
-void RenderWidgetHostImpl::DecrementInFlightEventCount() { |
+void RenderWidgetHostImpl::DecrementInFlightEventCount( |
+ InputEventAckSource ack_source) { |
if (decrement_in_flight_event_count() <= 0) { |
// Cancel pending hung renderer checks since the renderer is responsive. |
StopHangMonitorTimeout(); |
} else { |
- RestartHangMonitorTimeoutIfNecessary(); |
+ // Only restart the hang monitor timer if we got a response from the |
+ // main thread. |
+ if (ack_source == InputEventAckSource::MAIN_THREAD) |
+ RestartHangMonitorTimeoutIfNecessary(); |
} |
} |