Revert of Changed Blimp client to start with white screen before drawing contents

blimp/client/feature/compositor/blimp_compositor_manager.h

 // 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.
 
 #ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_MANAGER_H_
 #define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_MANAGER_H_
 
 #include "base/macros.h"
 #include "blimp/client/feature/compositor/blimp_compositor.h"
 #include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h"
 #include "blimp/client/feature/render_widget_feature.h"
 #include "cc/trees/layer_tree_settings.h"
 
 namespace blimp {
 namespace client {
 
-class BlimpCompositorManagerClient {
- public:
-  virtual void OnSwapBuffersCompleted() = 0;
-};
-
 // The BlimpCompositorManager manages multiple BlimpCompositor instances, each
 // mapped to a render widget on the engine. The compositor corresponding to
 // the render widget initialized on the engine will be the |active_compositor_|.
 // Only the |active_compositor_| holds the accelerated widget and builds the
 // output surface from this widget to draw to the view. All events from the
 // native view are forwarded to this compositor.
 class BlimpCompositorManager
     : public RenderWidgetFeature::RenderWidgetFeatureDelegate,
       public BlimpCompositorClient {
  public:
-  explicit BlimpCompositorManager(RenderWidgetFeature* render_widget_feature,
-                                  BlimpCompositorManagerClient* client);
+  explicit BlimpCompositorManager(RenderWidgetFeature* render_widget_feature);
   ~BlimpCompositorManager() override;
 
   void SetVisible(bool visible);
 
   void SetAcceleratedWidget(gfx::AcceleratedWidget widget);
 
   void ReleaseAcceleratedWidget();
 
   bool OnTouchEvent(const ui::MotionEvent& motion_event);
 
@@ skipping 16 matching lines @@
  private:
   // RenderWidgetFeatureDelegate implementation.
   void OnRenderWidgetCreated(int render_widget_id) override;
   void OnRenderWidgetInitialized(int render_widget_id) override;
   void OnRenderWidgetDeleted(int render_widget_id) override;
   void OnCompositorMessageReceived(
       int render_widget_id,
       std::unique_ptr<cc::proto::CompositorMessage> message) override;
 
   // BlimpCompositorClient implementation.
-  void DidCompleteSwapBuffers() override;
   cc::LayerTreeSettings* GetLayerTreeSettings() override;
   scoped_refptr<base::SingleThreadTaskRunner>
   GetCompositorTaskRunner() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::ImageSerializationProcessor* GetImageSerializationProcessor() override;
   void SendWebGestureEvent(
       int render_widget_id,
       const blink::WebGestureEvent& gesture_event) override;
   void SendCompositorMessage(
@@ skipping 22 matching lines @@
   BlimpCompositor* active_compositor_;
 
   // Lazily created thread that will run the compositor rendering tasks and will
   // be shared by all compositor instances.
   std::unique_ptr<base::Thread> compositor_thread_;
 
   // The bridge to the network layer that does the proto/RenderWidget id work.
   // BlimpCompositorManager does not own this and it is expected to outlive this
   // BlimpCompositorManager instance.
   RenderWidgetFeature* render_widget_feature_;
-  BlimpCompositorManagerClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositorManager);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_MANAGER_H_