| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 this, &settings_, output_surface_.get(), resource_provider.get(), | 201 this, &settings_, output_surface_.get(), resource_provider.get(), |
| 202 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); | 202 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); |
| 203 if (!renderer) | 203 if (!renderer) |
| 204 return; | 204 return; |
| 205 renderer_ = std::move(renderer); | 205 renderer_ = std::move(renderer); |
| 206 #else | 206 #else |
| 207 NOTREACHED(); | 207 NOTREACHED(); |
| 208 #endif | 208 #endif |
| 209 } else { | 209 } else { |
| 210 std::unique_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create( | 210 std::unique_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create( |
| 211 this, &settings_, output_surface_.get(), resource_provider.get()); | 211 this, &settings_, output_surface_.get(), resource_provider.get(), |
| 212 true /* use_image_hijack_canvas */); |
| 212 if (!renderer) | 213 if (!renderer) |
| 213 return; | 214 return; |
| 214 renderer_ = std::move(renderer); | 215 renderer_ = std::move(renderer); |
| 215 } | 216 } |
| 216 | 217 |
| 217 renderer_->SetEnlargePassTextureAmount(enlarge_texture_amount_); | 218 renderer_->SetEnlargePassTextureAmount(enlarge_texture_amount_); |
| 218 | 219 |
| 219 resource_provider_ = std::move(resource_provider); | 220 resource_provider_ = std::move(resource_provider); |
| 220 // TODO(jbauman): Outputting an incomplete quad list doesn't work when using | 221 // TODO(jbauman): Outputting an incomplete quad list doesn't work when using |
| 221 // overlays. | 222 // overlays. |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 | 433 |
| 433 if (surface_id == current_surface_id_) | 434 if (surface_id == current_surface_id_) |
| 434 UpdateRootSurfaceResourcesLocked(); | 435 UpdateRootSurfaceResourcesLocked(); |
| 435 } | 436 } |
| 436 | 437 |
| 437 SurfaceId Display::CurrentSurfaceId() { | 438 SurfaceId Display::CurrentSurfaceId() { |
| 438 return current_surface_id_; | 439 return current_surface_id_; |
| 439 } | 440 } |
| 440 | 441 |
| 441 } // namespace cc | 442 } // namespace cc |
| OLD | NEW |