OLD | NEW |
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/core/compositor/blob_image_serialization_processor.h" | 9 #include "blimp/client/core/compositor/blob_image_serialization_processor.h" |
10 #include "blimp/client/feature/compositor/blimp_layer_tree_settings.h" | 10 #include "blimp/client/feature/compositor/blimp_layer_tree_settings.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 if (!settings_) { | 126 if (!settings_) { |
127 settings_.reset(new cc::LayerTreeSettings); | 127 settings_.reset(new cc::LayerTreeSettings); |
128 | 128 |
129 // TODO(khushalsagar): The server should selectively send only those | 129 // TODO(khushalsagar): The server should selectively send only those |
130 // LayerTreeSettings which should remain consistent across the server and | 130 // LayerTreeSettings which should remain consistent across the server and |
131 // client. Since it currently overrides all settings, ignore them. | 131 // client. Since it currently overrides all settings, ignore them. |
132 // See crbug/577985. | 132 // See crbug/577985. |
133 GenerateLayerTreeSettings(settings_.get()); | 133 GenerateLayerTreeSettings(settings_.get()); |
134 settings_ | 134 settings_ |
135 ->abort_commit_before_output_surface_creation = false; | 135 ->abort_commit_before_output_surface_creation = false; |
| 136 settings_->renderer_settings.buffer_to_texture_target_map = |
| 137 BlimpGpuMemoryBufferManager::GetDefaultBufferToTextureTargetMap(); |
136 } | 138 } |
137 | 139 |
138 return settings_.get(); | 140 return settings_.get(); |
139 } | 141 } |
140 | 142 |
141 void BlimpCompositorManager::DidCompleteSwapBuffers() { | 143 void BlimpCompositorManager::DidCompleteSwapBuffers() { |
142 DCHECK(client_); | 144 DCHECK(client_); |
143 client_->OnSwapBuffersCompleted(); | 145 client_->OnSwapBuffersCompleted(); |
144 } | 146 } |
145 | 147 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 | 205 |
204 BlimpCompositor* BlimpCompositorManager::GetCompositor(int render_widget_id) { | 206 BlimpCompositor* BlimpCompositorManager::GetCompositor(int render_widget_id) { |
205 CompositorMap::const_iterator it = compositors_.find(render_widget_id); | 207 CompositorMap::const_iterator it = compositors_.find(render_widget_id); |
206 if (it == compositors_.end()) | 208 if (it == compositors_.end()) |
207 return nullptr; | 209 return nullptr; |
208 return it->second.get(); | 210 return it->second.get(); |
209 } | 211 } |
210 | 212 |
211 } // namespace client | 213 } // namespace client |
212 } // namespace blimp | 214 } // namespace blimp |
OLD | NEW |