| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 renderer_->Finish(); | 81 renderer_->Finish(); |
| 82 current_surface_size_ = size; | 82 current_surface_size_ = size; |
| 83 if (scheduler_) | 83 if (scheduler_) |
| 84 scheduler_->EntireDisplayDamaged(current_surface_id_); | 84 scheduler_->EntireDisplayDamaged(current_surface_id_); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void Display::InitializeRenderer() { | 87 void Display::InitializeRenderer() { |
| 88 if (resource_provider_) | 88 if (resource_provider_) |
| 89 return; | 89 return; |
| 90 | 90 |
| 91 // Display does not use GpuMemoryBuffers, so persistent map is not relevant. |
| 92 bool use_persistent_map_for_gpu_memory_buffers = false; |
| 91 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( | 93 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( |
| 92 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, | 94 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, |
| 93 blocking_main_thread_task_runner_.get(), settings_.highp_threshold_min, | 95 blocking_main_thread_task_runner_.get(), settings_.highp_threshold_min, |
| 94 settings_.use_rgba_4444_textures, | 96 settings_.use_rgba_4444_textures, |
| 95 settings_.texture_id_allocation_chunk_size); | 97 settings_.texture_id_allocation_chunk_size, |
| 98 use_persistent_map_for_gpu_memory_buffers); |
| 96 if (!resource_provider) | 99 if (!resource_provider) |
| 97 return; | 100 return; |
| 98 | 101 |
| 99 if (output_surface_->context_provider()) { | 102 if (output_surface_->context_provider()) { |
| 100 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( | 103 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( |
| 101 this, &settings_, output_surface_.get(), resource_provider.get(), | 104 this, &settings_, output_surface_.get(), resource_provider.get(), |
| 102 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); | 105 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); |
| 103 if (!renderer) | 106 if (!renderer) |
| 104 return; | 107 return; |
| 105 renderer_ = renderer.Pass(); | 108 renderer_ = renderer.Pass(); |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 | 274 |
| 272 if (surface_id == current_surface_id_) | 275 if (surface_id == current_surface_id_) |
| 273 UpdateRootSurfaceResourcesLocked(); | 276 UpdateRootSurfaceResourcesLocked(); |
| 274 } | 277 } |
| 275 | 278 |
| 276 SurfaceId Display::CurrentSurfaceId() { | 279 SurfaceId Display::CurrentSurfaceId() { |
| 277 return current_surface_id_; | 280 return current_surface_id_; |
| 278 } | 281 } |
| 279 | 282 |
| 280 } // namespace cc | 283 } // namespace cc |
| OLD | NEW |