| Index: cc/test/fake_layer_tree_host_client.cc
|
| diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
|
| index 6de02bf6175e5c439f39c75a29359423e6a40d2b..7fd613875f13bc66170cef3c0976cba4bd422c19 100644
|
| --- a/cc/test/fake_layer_tree_host_client.cc
|
| +++ b/cc/test/fake_layer_tree_host_client.cc
|
| @@ -12,33 +12,12 @@
|
|
|
| namespace cc {
|
|
|
| -FakeLayerTreeHostClient::FakeLayerTreeHostClient(RendererOptions options)
|
| - : use_software_rendering_(options == DIRECT_SOFTWARE ||
|
| - options == DELEGATED_SOFTWARE),
|
| - use_delegating_renderer_(options == DELEGATED_3D ||
|
| - options == DELEGATED_SOFTWARE),
|
| - host_(NULL) {
|
| -}
|
| -
|
| -FakeLayerTreeHostClient::~FakeLayerTreeHostClient() {}
|
| +FakeLayerTreeHostClient::FakeLayerTreeHostClient() = default;
|
| +FakeLayerTreeHostClient::~FakeLayerTreeHostClient() = default;
|
|
|
| void FakeLayerTreeHostClient::RequestNewOutputSurface() {
|
| DCHECK(host_);
|
| - std::unique_ptr<OutputSurface> surface;
|
| - if (use_software_rendering_) {
|
| - if (use_delegating_renderer_) {
|
| - surface = FakeOutputSurface::CreateDelegatingSoftware(
|
| - base::WrapUnique(new SoftwareOutputDevice));
|
| - } else {
|
| - surface = FakeOutputSurface::CreateSoftware(
|
| - base::WrapUnique(new SoftwareOutputDevice));
|
| - }
|
| - } else if (use_delegating_renderer_) {
|
| - surface = FakeOutputSurface::CreateDelegating3d();
|
| - } else {
|
| - surface = FakeOutputSurface::Create3d();
|
| - }
|
| - host_->SetOutputSurface(std::move(surface));
|
| + host_->SetOutputSurface(FakeOutputSurface::CreateDelegating3d());
|
| }
|
|
|
| void FakeLayerTreeHostClient::DidFailToInitializeOutputSurface() {
|
|
|