OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/compositor/compositor.h" | 5 #include "ui/compositor/compositor.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <deque> | 10 #include <deque> |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
165 DCHECK_GT(settings.use_image_texture_targets.size(), format); | 165 DCHECK_GT(settings.use_image_texture_targets.size(), format); |
166 settings.use_image_texture_targets[format] = | 166 settings.use_image_texture_targets[format] = |
167 context_factory_->GetImageTextureTarget( | 167 context_factory_->GetImageTextureTarget( |
168 static_cast<gfx::BufferFormat>(format), usage); | 168 static_cast<gfx::BufferFormat>(format), usage); |
169 } | 169 } |
170 | 170 |
171 // Note: Only enable image decode tasks if we have more than one worker | 171 // Note: Only enable image decode tasks if we have more than one worker |
172 // thread. | 172 // thread. |
173 settings.image_decode_tasks_enabled = false; | 173 settings.image_decode_tasks_enabled = false; |
174 | 174 |
175 settings.use_output_surface_begin_frame_source = true; | |
no sievers
2016/04/06 21:40:19
and here, unused too?
enne (OOO)
2016/04/06 21:42:58
This is used in SingleThreadProxy.
| |
176 | |
175 #if !defined(OS_ANDROID) | 177 #if !defined(OS_ANDROID) |
176 // TODO(sohanjg): Revisit this memory usage in tile manager. | 178 // TODO(sohanjg): Revisit this memory usage in tile manager. |
177 cc::ManagedMemoryPolicy policy( | 179 cc::ManagedMemoryPolicy policy( |
178 512 * 1024 * 1024, gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE, | 180 512 * 1024 * 1024, gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE, |
179 settings.memory_policy_.num_resources_limit); | 181 settings.memory_policy_.num_resources_limit); |
180 settings.memory_policy_ = policy; | 182 settings.memory_policy_ = policy; |
181 #endif | 183 #endif |
182 | 184 |
183 base::TimeTicks before_create = base::TimeTicks::Now(); | 185 base::TimeTicks before_create = base::TimeTicks::Now(); |
184 | 186 |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
523 observer_list_, | 525 observer_list_, |
524 OnCompositingLockStateChanged(this)); | 526 OnCompositingLockStateChanged(this)); |
525 } | 527 } |
526 | 528 |
527 void Compositor::CancelCompositorLock() { | 529 void Compositor::CancelCompositorLock() { |
528 if (compositor_lock_) | 530 if (compositor_lock_) |
529 compositor_lock_->CancelLock(); | 531 compositor_lock_->CancelLock(); |
530 } | 532 } |
531 | 533 |
532 } // namespace ui | 534 } // namespace ui |
OLD | NEW |