| 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 4afec65e2be43a227764516076b2ccd59f26758f..15b899540dc237e86f109eb9d4e65a42d230ea75 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -294,7 +294,6 @@
|
| last_event_type_(blink::WebInputEvent::Undefined),
|
| new_content_rendering_delay_(
|
| base::TimeDelta::FromMilliseconds(kNewContentRenderingDelayMs)),
|
| - current_content_source_id_(0),
|
| weak_factory_(this) {
|
| CHECK(delegate_);
|
| CHECK_NE(MSG_ROUTING_NONE, routing_id_);
|
| @@ -986,9 +985,7 @@
|
| RendererIsResponsive();
|
| }
|
|
|
| -void RenderWidgetHostImpl::StartNewContentRenderingTimeout(
|
| - uint32_t next_source_id) {
|
| - current_content_source_id_ = next_source_id;
|
| +void RenderWidgetHostImpl::StartNewContentRenderingTimeout() {
|
| // It is possible for a compositor frame to arrive before the browser is
|
| // notified about the page being committed, in which case no timer is
|
| // necessary.
|
| @@ -1832,13 +1829,7 @@
|
| if (touch_emulator_)
|
| touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
|
|
|
| - // Ignore this frame if its content has already been unloaded. Source ID
|
| - // is always zero for an OOPIF because we are only concerned with displaying
|
| - // stale graphics on top-level frames. We accept frames that have a source ID
|
| - // greater than |current_content_source_id_| because in some cases the first
|
| - // compositor frame can arrive before the navigation commit message that
|
| - // updates that value.
|
| - if (view_ && frame.metadata.content_source_id >= current_content_source_id_) {
|
| + if (view_) {
|
| view_->OnSwapCompositorFrame(compositor_frame_sink_id, std::move(frame));
|
| view_->DidReceiveRendererFrame();
|
| } else {
|
|
|