cc: Force a redraw on initializing a new output surface for remote compositor.

cc/trees/remote_channel_impl.cc

 // Copyright 2016 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 "cc/trees/remote_channel_impl.h"
 
 #include "base/bind_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/animation/animation_events.h"
 #include "cc/proto/compositor_message.pb.h"
@@ skipping 121 matching lines @@
       ImplThreadTaskRunner()->PostTask(
           FROM_HERE,
           base::Bind(&ProxyImpl::BeginMainFrameAbortedOnImpl,
                      proxy_impl_weak_ptr_, reason, main_thread_start_time));
     } break;
     case proto::CompositorMessageToImpl::SET_NEEDS_REDRAW: {
       const proto::SetNeedsRedraw& set_needs_redraw_message =
           proto.set_needs_redraw_message();
       gfx::Rect damaged_rect =
           ProtoToRect(set_needs_redraw_message.damaged_rect());
-      ImplThreadTaskRunner()->PostTask(
-          FROM_HERE, base::Bind(&ProxyImpl::SetNeedsRedrawOnImpl,
-                                proxy_impl_weak_ptr_, damaged_rect));
+      PostSetNeedsRedrawToImpl(damaged_rect);
     } break;
   }
 }
 
 void RemoteChannelImpl::FinishAllRendering() {
   NOTREACHED() << "Should not be called on the remote client LayerTreeHost";
 }
 
 bool RemoteChannelImpl::IsStarted() const {
   DCHECK(task_runner_provider_->IsMainThread());
@@ skipping 266 matching lines @@
   main().layer_tree_host->DidInitializeOutputSurface();
 
   // If we were waiting for output surface initialization, we might have queued
   // some messages. Relay them now that a new output surface has been
   // initialized.
   main().waiting_for_output_surface_initialization = false;
   while (!main().pending_messages.empty()) {
     HandleProto(main().pending_messages.front());
     main().pending_messages.pop();
   }
+
+  // The commit after a new output surface can early out, in which case we will
+  // never redraw. Schedule one just to be safe.
+  PostSetNeedsRedrawToImpl(
+      gfx::Rect(main().layer_tree_host->device_viewport_size()));
 }
 
 void RemoteChannelImpl::SendMessageProtoOnMain(
     scoped_ptr<proto::CompositorMessage> proto) {
   DCHECK(task_runner_provider_->IsMainThread());
 
   main().remote_proto_channel->SendCompositorProto(*proto);
 }
 
+void RemoteChannelImpl::PostSetNeedsRedrawToImpl(
+    const gfx::Rect& damaged_rect) {
+  DCHECK(task_runner_provider_->IsMainThread());
+
+  ImplThreadTaskRunner()->PostTask(
+      FROM_HERE, base::Bind(&ProxyImpl::SetNeedsRedrawOnImpl,
+                            proxy_impl_weak_ptr_, damaged_rect));
+}
+
 void RemoteChannelImpl::InitializeImplOnImpl(CompletionEvent* completion,
                                              LayerTreeHost* layer_tree_host) {
   DCHECK(task_runner_provider_->IsMainThreadBlocked());
   DCHECK(task_runner_provider_->IsImplThread());
 
   impl().proxy_impl =
       CreateProxyImpl(this, layer_tree_host, task_runner_provider_, nullptr);
   impl().proxy_impl_weak_factory = make_scoped_ptr(
       new base::WeakPtrFactory<ProxyImpl>(impl().proxy_impl.get()));
   proxy_impl_weak_ptr_ = impl().proxy_impl_weak_factory->GetWeakPtr();
@@ skipping 58 matching lines @@
 
 RemoteChannelImpl::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<RemoteChannelImpl> remote_channel_weak_ptr)
     : proxy_impl(nullptr),
       proxy_impl_weak_factory(nullptr),
       remote_channel_weak_ptr(remote_channel_weak_ptr) {}
 
 RemoteChannelImpl::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc