| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "cc/surfaces/display.h" | 5 #include "cc/surfaces/display.h" |
| 6 | 6 |
| 7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
| 8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
| 9 #include "cc/debug/benchmark_instrumentation.h" | 9 #include "cc/debug/benchmark_instrumentation.h" |
| 10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 swapped_since_resize_ = false; | 84 swapped_since_resize_ = false; |
| 85 current_surface_size_ = size; | 85 current_surface_size_ = size; |
| 86 if (scheduler_) | 86 if (scheduler_) |
| 87 scheduler_->EntireDisplayDamaged(current_surface_id_); | 87 scheduler_->EntireDisplayDamaged(current_surface_id_); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void Display::InitializeRenderer() { | 90 void Display::InitializeRenderer() { |
| 91 if (resource_provider_) | 91 if (resource_provider_) |
| 92 return; | 92 return; |
| 93 | 93 |
| 94 // Display does not use GpuMemoryBuffers, so persistent map is not relevant. |
| 95 bool use_persistent_map_for_gpu_memory_buffers = false; |
| 94 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( | 96 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( |
| 95 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, | 97 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, |
| 96 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures, | 98 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures, |
| 97 settings_.texture_id_allocation_chunk_size); | 99 settings_.texture_id_allocation_chunk_size, |
| 100 use_persistent_map_for_gpu_memory_buffers); |
| 98 if (!resource_provider) | 101 if (!resource_provider) |
| 99 return; | 102 return; |
| 100 | 103 |
| 101 if (output_surface_->context_provider()) { | 104 if (output_surface_->context_provider()) { |
| 102 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( | 105 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( |
| 103 this, &settings_, output_surface_.get(), resource_provider.get(), | 106 this, &settings_, output_surface_.get(), resource_provider.get(), |
| 104 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); | 107 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); |
| 105 if (!renderer) | 108 if (!renderer) |
| 106 return; | 109 return; |
| 107 renderer_ = renderer.Pass(); | 110 renderer_ = renderer.Pass(); |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 275 |
| 273 if (surface_id == current_surface_id_) | 276 if (surface_id == current_surface_id_) |
| 274 UpdateRootSurfaceResourcesLocked(); | 277 UpdateRootSurfaceResourcesLocked(); |
| 275 } | 278 } |
| 276 | 279 |
| 277 SurfaceId Display::CurrentSurfaceId() { | 280 SurfaceId Display::CurrentSurfaceId() { |
| 278 return current_surface_id_; | 281 return current_surface_id_; |
| 279 } | 282 } |
| 280 | 283 |
| 281 } // namespace cc | 284 } // namespace cc |
| OLD | NEW |