| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/gl_renderer.h" | 5 #include "cc/gl_renderer.h" |
| 6 | 6 |
| 7 #include "cc/draw_quad.h" | 7 #include "cc/draw_quad.h" |
| 8 #include "cc/prioritized_resource_manager.h" | 8 #include "cc/prioritized_resource_manager.h" |
| 9 #include "cc/resource_provider.h" | 9 #include "cc/resource_provider.h" |
| 10 #include "cc/test/fake_web_compositor_output_surface.h" | 10 #include "cc/test/fake_web_compositor_output_surface.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 public: | 98 public: |
| 99 FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) :
GLRenderer(client, resourceProvider) { } | 99 FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) :
GLRenderer(client, resourceProvider) { } |
| 100 | 100 |
| 101 // GLRenderer methods. | 101 // GLRenderer methods. |
| 102 | 102 |
| 103 // Changing visibility to public. | 103 // Changing visibility to public. |
| 104 using GLRenderer::initialize; | 104 using GLRenderer::initialize; |
| 105 using GLRenderer::isFramebufferDiscarded; | 105 using GLRenderer::isFramebufferDiscarded; |
| 106 using GLRenderer::drawQuad; | 106 using GLRenderer::drawQuad; |
| 107 using GLRenderer::beginDrawingFrame; | 107 using GLRenderer::beginDrawingFrame; |
| 108 using GLRenderer::finishDrawingQuadList; |
| 108 }; | 109 }; |
| 109 | 110 |
| 110 class GLRendererTest : public testing::Test { | 111 class GLRendererTest : public testing::Test { |
| 111 protected: | 112 protected: |
| 112 GLRendererTest() | 113 GLRendererTest() |
| 113 : m_suggestHaveBackbufferYes(1, true) | 114 : m_suggestHaveBackbufferYes(1, true) |
| 114 , m_suggestHaveBackbufferNo(1, false) | 115 , m_suggestHaveBackbufferNo(1, false) |
| 115 , m_context(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::We
bGraphicsContext3D>(new FrameCountingMemoryAllocationSettingContext()))) | 116 , m_context(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::We
bGraphicsContext3D>(new FrameCountingMemoryAllocationSettingContext()))) |
| 116 , m_resourceProvider(ResourceProvider::create(m_context.get())) | 117 , m_resourceProvider(ResourceProvider::create(m_context.get())) |
| 117 , m_renderer(&m_mockClient, m_resourceProvider.get()) | 118 , m_renderer(&m_mockClient, m_resourceProvider.get()) |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 context->setInDraw(); | 538 context->setInDraw(); |
| 538 | 539 |
| 539 cc::DirectRenderer::DrawingFrame drawingFrame; | 540 cc::DirectRenderer::DrawingFrame drawingFrame; |
| 540 renderer.beginDrawingFrame(drawingFrame); | 541 renderer.beginDrawingFrame(drawingFrame); |
| 541 EXPECT_EQ(context->activeTexture(), GL_TEXTURE0); | 542 EXPECT_EQ(context->activeTexture(), GL_TEXTURE0); |
| 542 | 543 |
| 543 for (cc::QuadList::backToFrontIterator it = pass->quad_list.backToFrontBegin
(); | 544 for (cc::QuadList::backToFrontIterator it = pass->quad_list.backToFrontBegin
(); |
| 544 it != pass->quad_list.backToFrontEnd(); ++it) { | 545 it != pass->quad_list.backToFrontEnd(); ++it) { |
| 545 renderer.drawQuad(drawingFrame, *it); | 546 renderer.drawQuad(drawingFrame, *it); |
| 546 } | 547 } |
| 548 renderer.finishDrawingQuadList(); |
| 547 EXPECT_EQ(context->activeTexture(), GL_TEXTURE0); | 549 EXPECT_EQ(context->activeTexture(), GL_TEXTURE0); |
| 548 } | 550 } |
| 549 | 551 |
| 550 } // namespace | 552 } // namespace |
| 551 } // namespace cc | 553 } // namespace cc |
| OLD | NEW |