| 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/output/delegating_renderer.h" | 5 #include "cc/output/delegating_renderer.h" |
| 6 #include "cc/output/gl_renderer.h" | 6 #include "cc/output/gl_renderer.h" |
| 7 #include "cc/output/output_surface.h" | 7 #include "cc/output/output_surface.h" |
| 8 #include "cc/test/fake_output_surface_client.h" | 8 #include "cc/test/fake_output_surface_client.h" |
| 9 #include "cc/test/fake_renderer_client.h" | 9 #include "cc/test/fake_renderer_client.h" |
| 10 #include "cc/test/fake_resource_provider.h" | 10 #include "cc/test/fake_resource_provider.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 const RendererSettings* settings, | 56 const RendererSettings* settings, |
| 57 OutputSurface* output_surface, | 57 OutputSurface* output_surface, |
| 58 ResourceProvider* resource_provider); | 58 ResourceProvider* resource_provider); |
| 59 | 59 |
| 60 template <> | 60 template <> |
| 61 std::unique_ptr<Renderer> CreateRenderer<DelegatingRenderer>( | 61 std::unique_ptr<Renderer> CreateRenderer<DelegatingRenderer>( |
| 62 RendererClient* client, | 62 RendererClient* client, |
| 63 const RendererSettings* settings, | 63 const RendererSettings* settings, |
| 64 OutputSurface* output_surface, | 64 OutputSurface* output_surface, |
| 65 ResourceProvider* resource_provider) { | 65 ResourceProvider* resource_provider) { |
| 66 return DelegatingRenderer::Create( | 66 return base::MakeUnique<DelegatingRenderer>(client, settings, output_surface, |
| 67 client, settings, output_surface, resource_provider); | 67 resource_provider); |
| 68 } | 68 } |
| 69 | 69 |
| 70 template <> | 70 template <> |
| 71 std::unique_ptr<Renderer> CreateRenderer<GLRenderer>( | 71 std::unique_ptr<Renderer> CreateRenderer<GLRenderer>( |
| 72 RendererClient* client, | 72 RendererClient* client, |
| 73 const RendererSettings* settings, | 73 const RendererSettings* settings, |
| 74 OutputSurface* output_surface, | 74 OutputSurface* output_surface, |
| 75 ResourceProvider* resource_provider) { | 75 ResourceProvider* resource_provider) { |
| 76 return GLRenderer::Create( | 76 return base::MakeUnique<GLRenderer>(client, settings, output_surface, |
| 77 client, settings, output_surface, resource_provider, NULL, 0); | 77 resource_provider, nullptr, 0); |
| 78 } | 78 } |
| 79 | 79 |
| 80 template <typename T> | 80 template <typename T> |
| 81 class RendererTest : public ::testing::Test { | 81 class RendererTest : public ::testing::Test { |
| 82 protected: | 82 protected: |
| 83 virtual void SetUp() { | 83 virtual void SetUp() { |
| 84 context_provider_ = | 84 context_provider_ = |
| 85 new MockContextProvider(TestWebGraphicsContext3D::Create()); | 85 new MockContextProvider(TestWebGraphicsContext3D::Create()); |
| 86 output_surface_.reset(new TestOutputSurface(context_provider_)); | 86 output_surface_.reset(new TestOutputSurface(context_provider_)); |
| 87 output_surface_->BindToClient(&output_surface_client_); | 87 output_surface_->BindToClient(&output_surface_client_); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 109 EXPECT_CALL(*(this->context_provider_.get()), DeleteCachedResources()) | 109 EXPECT_CALL(*(this->context_provider_.get()), DeleteCachedResources()) |
| 110 .Times(1); | 110 .Times(1); |
| 111 | 111 |
| 112 EXPECT_TRUE(this->renderer_->visible()); | 112 EXPECT_TRUE(this->renderer_->visible()); |
| 113 this->renderer_->SetVisible(false); | 113 this->renderer_->SetVisible(false); |
| 114 EXPECT_FALSE(this->renderer_->visible()); | 114 EXPECT_FALSE(this->renderer_->visible()); |
| 115 } | 115 } |
| 116 | 116 |
| 117 } // namespace | 117 } // namespace |
| 118 } // namespace cc | 118 } // namespace cc |
| OLD | NEW |