Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(777)

Side by Side Diff: blimp/client/feature/compositor/blimp_compositor_manager.cc

Issue 1925863003: Changed Blimp client to start with white screen before drawing contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge origin/master Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "blimp/client/feature/compositor/blimp_compositor_manager.h" 5 #include "blimp/client/feature/compositor/blimp_compositor_manager.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "blimp/client/feature/compositor/blimp_layer_tree_settings.h" 9 #include "blimp/client/feature/compositor/blimp_layer_tree_settings.h"
10 #include "blimp/common/compositor/blimp_image_serialization_processor.h" 10 #include "blimp/common/compositor/blimp_image_serialization_processor.h"
11 #include "blimp/common/compositor/blimp_task_graph_runner.h" 11 #include "blimp/common/compositor/blimp_task_graph_runner.h"
12 #include "cc/proto/compositor_message.pb.h" 12 #include "cc/proto/compositor_message.pb.h"
13 13
14 namespace blimp { 14 namespace blimp {
15 namespace client { 15 namespace client {
16 16
17 namespace { 17 namespace {
18 base::LazyInstance<blimp::BlimpTaskGraphRunner> g_task_graph_runner = 18 base::LazyInstance<blimp::BlimpTaskGraphRunner> g_task_graph_runner =
19 LAZY_INSTANCE_INITIALIZER; 19 LAZY_INSTANCE_INITIALIZER;
20 20
21 const int kDummyTabId = 0; 21 const int kDummyTabId = 0;
22 } // namespace 22 } // namespace
23 23
24 BlimpCompositorManager::BlimpCompositorManager( 24 BlimpCompositorManager::BlimpCompositorManager(
25 RenderWidgetFeature* render_widget_feature) 25 RenderWidgetFeature* render_widget_feature,
26 BlimpCompositorManagerClient* client)
26 : visible_(false), 27 : visible_(false),
27 window_(gfx::kNullAcceleratedWidget), 28 window_(gfx::kNullAcceleratedWidget),
28 gpu_memory_buffer_manager_(new BlimpGpuMemoryBufferManager), 29 gpu_memory_buffer_manager_(new BlimpGpuMemoryBufferManager),
29 image_serialization_processor_( 30 image_serialization_processor_(new BlimpImageSerializationProcessor(
30 new BlimpImageSerializationProcessor( 31 BlimpImageSerializationProcessor::Mode::DESERIALIZATION)),
31 BlimpImageSerializationProcessor::Mode::DESERIALIZATION)),
32 active_compositor_(nullptr), 32 active_compositor_(nullptr),
33 render_widget_feature_(render_widget_feature) { 33 render_widget_feature_(render_widget_feature),
34 client_(client) {
34 DCHECK(render_widget_feature_); 35 DCHECK(render_widget_feature_);
35 render_widget_feature_->SetDelegate(kDummyTabId, this); 36 render_widget_feature_->SetDelegate(kDummyTabId, this);
36 } 37 }
37 38
38 BlimpCompositorManager::~BlimpCompositorManager() { 39 BlimpCompositorManager::~BlimpCompositorManager() {
39 render_widget_feature_->RemoveDelegate(kDummyTabId); 40 render_widget_feature_->RemoveDelegate(kDummyTabId);
40 if (compositor_thread_) 41 if (compositor_thread_)
41 compositor_thread_->Stop(); 42 compositor_thread_->Stop();
42 } 43 }
43 44
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // client. Since it currently overrides all settings, ignore them. 133 // client. Since it currently overrides all settings, ignore them.
133 // See crbug/577985. 134 // See crbug/577985.
134 GenerateLayerTreeSettings(settings_.get()); 135 GenerateLayerTreeSettings(settings_.get());
135 settings_ 136 settings_
136 ->abort_commit_before_output_surface_creation = false; 137 ->abort_commit_before_output_surface_creation = false;
137 } 138 }
138 139
139 return settings_.get(); 140 return settings_.get();
140 } 141 }
141 142
143 void BlimpCompositorManager::DidCompleteSwapBuffers() {
144 DCHECK(client_);
145 client_->OnSwapBuffersCompleted();
146 }
147
142 scoped_refptr<base::SingleThreadTaskRunner> 148 scoped_refptr<base::SingleThreadTaskRunner>
143 BlimpCompositorManager::GetCompositorTaskRunner() { 149 BlimpCompositorManager::GetCompositorTaskRunner() {
144 if (compositor_thread_) 150 if (compositor_thread_)
145 return compositor_thread_->task_runner(); 151 return compositor_thread_->task_runner();
146 152
147 base::Thread::Options thread_options; 153 base::Thread::Options thread_options;
148 #if defined(OS_ANDROID) 154 #if defined(OS_ANDROID)
149 thread_options.priority = base::ThreadPriority::DISPLAY; 155 thread_options.priority = base::ThreadPriority::DISPLAY;
150 #endif 156 #endif
151 compositor_thread_.reset(new base::Thread("Compositor")); 157 compositor_thread_.reset(new base::Thread("Compositor"));
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 200
195 BlimpCompositor* BlimpCompositorManager::GetCompositor(int render_widget_id) { 201 BlimpCompositor* BlimpCompositorManager::GetCompositor(int render_widget_id) {
196 CompositorMap::const_iterator it = compositors_.find(render_widget_id); 202 CompositorMap::const_iterator it = compositors_.find(render_widget_id);
197 if (it == compositors_.end()) 203 if (it == compositors_.end())
198 return nullptr; 204 return nullptr;
199 return it->second.get(); 205 return it->second.get();
200 } 206 }
201 207
202 } // namespace client 208 } // namespace client
203 } // namespace blimp 209 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698