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

blimp/client/feature/compositor/blimp_compositor_manager.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 "blimp/client/feature/compositor/blimp_compositor_manager.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "blimp/client/feature/compositor/blimp_layer_tree_settings.h"
 #include "blimp/common/compositor/blimp_image_serialization_processor.h"
 #include "blimp/common/compositor/blimp_task_graph_runner.h"
 #include "cc/proto/compositor_message.pb.h"
 
 namespace blimp {
 namespace client {
 
 namespace {
 base::LazyInstance<blimp::BlimpTaskGraphRunner> g_task_graph_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 const int kDummyTabId = 0;
 }  // namespace
 
 BlimpCompositorManager::BlimpCompositorManager(
-    RenderWidgetFeature* render_widget_feature,
-    BlimpCompositorManagerClient* client)
+    RenderWidgetFeature* render_widget_feature)
     : visible_(false),
       window_(gfx::kNullAcceleratedWidget),
       gpu_memory_buffer_manager_(new BlimpGpuMemoryBufferManager),
-      image_serialization_processor_(new BlimpImageSerializationProcessor(
-          BlimpImageSerializationProcessor::Mode::DESERIALIZATION)),
+      image_serialization_processor_(
+          new BlimpImageSerializationProcessor(
+              BlimpImageSerializationProcessor::Mode::DESERIALIZATION)),
       active_compositor_(nullptr),
-      render_widget_feature_(render_widget_feature),
-      client_(client) {
+      render_widget_feature_(render_widget_feature) {
   DCHECK(render_widget_feature_);
   render_widget_feature_->SetDelegate(kDummyTabId, this);
 }
 
 BlimpCompositorManager::~BlimpCompositorManager() {
   render_widget_feature_->RemoveDelegate(kDummyTabId);
   if (compositor_thread_)
     compositor_thread_->Stop();
 }
 
@@ skipping 88 matching lines @@
     // client. Since it currently overrides all settings, ignore them.
     // See crbug/577985.
     GenerateLayerTreeSettings(settings_.get());
     settings_
       ->abort_commit_before_output_surface_creation = false;
   }
 
   return settings_.get();
 }
 
-void BlimpCompositorManager::DidCompleteSwapBuffers() {
-  DCHECK(client_);
-  client_->OnSwapBuffersCompleted();
-}
-
 scoped_refptr<base::SingleThreadTaskRunner>
 BlimpCompositorManager::GetCompositorTaskRunner() {
   if (compositor_thread_)
     return compositor_thread_->task_runner();
 
   base::Thread::Options thread_options;
 #if defined(OS_ANDROID)
   thread_options.priority = base::ThreadPriority::DISPLAY;
 #endif
   compositor_thread_.reset(new base::Thread("Compositor"));
@@ skipping 42 matching lines @@
 
 BlimpCompositor* BlimpCompositorManager::GetCompositor(int render_widget_id) {
   CompositorMap::const_iterator it = compositors_.find(render_widget_id);
   if (it == compositors_.end())
     return nullptr;
   return it->second.get();
 }
 
 }  // namespace client
 }  // namespace blimp