| 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/test_context_provider.h" | 10 #include "cc/test/test_context_provider.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 OutputSurface* output_surface, | 31 OutputSurface* output_surface, |
| 32 ResourceProvider* resource_provider); | 32 ResourceProvider* resource_provider); |
| 33 | 33 |
| 34 template <> | 34 template <> |
| 35 scoped_ptr<Renderer> CreateRenderer<DelegatingRenderer>( | 35 scoped_ptr<Renderer> CreateRenderer<DelegatingRenderer>( |
| 36 RendererClient* client, | 36 RendererClient* client, |
| 37 const LayerTreeSettings* settings, | 37 const LayerTreeSettings* settings, |
| 38 OutputSurface* output_surface, | 38 OutputSurface* output_surface, |
| 39 ResourceProvider* resource_provider) { | 39 ResourceProvider* resource_provider) { |
| 40 return DelegatingRenderer::Create( | 40 return DelegatingRenderer::Create( |
| 41 client, settings, output_surface, resource_provider); | 41 client, settings, output_surface, resource_provider) |
| 42 .PassAs<Renderer>(); |
| 42 } | 43 } |
| 43 | 44 |
| 44 template <> | 45 template <> |
| 45 scoped_ptr<Renderer> CreateRenderer<GLRenderer>( | 46 scoped_ptr<Renderer> CreateRenderer<GLRenderer>( |
| 46 RendererClient* client, | 47 RendererClient* client, |
| 47 const LayerTreeSettings* settings, | 48 const LayerTreeSettings* settings, |
| 48 OutputSurface* output_surface, | 49 OutputSurface* output_surface, |
| 49 ResourceProvider* resource_provider) { | 50 ResourceProvider* resource_provider) { |
| 50 return GLRenderer::Create( | 51 return GLRenderer::Create( |
| 51 client, settings, output_surface, resource_provider, NULL, 0); | 52 client, settings, output_surface, resource_provider, NULL, 0) |
| 53 .PassAs<Renderer>(); |
| 52 } | 54 } |
| 53 | 55 |
| 54 template <typename T> | 56 template <typename T> |
| 55 class RendererTest : public ::testing::Test { | 57 class RendererTest : public ::testing::Test { |
| 56 protected: | 58 protected: |
| 57 virtual void SetUp() { | 59 virtual void SetUp() { |
| 58 context_provider_ = | 60 context_provider_ = |
| 59 new MockContextProvider(TestWebGraphicsContext3D::Create()); | 61 new MockContextProvider(TestWebGraphicsContext3D::Create()); |
| 60 output_surface_.reset(new OutputSurface(context_provider_)); | 62 output_surface_.reset(new OutputSurface(context_provider_)); |
| 61 output_surface_->BindToClient(&output_surface_client_); | 63 output_surface_->BindToClient(&output_surface_client_); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 83 EXPECT_CALL(*(this->context_provider_.get()), DeleteCachedResources()) | 85 EXPECT_CALL(*(this->context_provider_.get()), DeleteCachedResources()) |
| 84 .Times(1); | 86 .Times(1); |
| 85 | 87 |
| 86 EXPECT_TRUE(this->renderer_->visible()); | 88 EXPECT_TRUE(this->renderer_->visible()); |
| 87 this->renderer_->SetVisible(false); | 89 this->renderer_->SetVisible(false); |
| 88 EXPECT_FALSE(this->renderer_->visible()); | 90 EXPECT_FALSE(this->renderer_->visible()); |
| 89 } | 91 } |
| 90 | 92 |
| 91 } // namespace | 93 } // namespace |
| 92 } // namespace cc | 94 } // namespace cc |
| OLD | NEW |