| 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 "config.h" | 5 #include "config.h" |
| 6 #include "cc/gl_renderer.h" | 6 #include "cc/gl_renderer.h" |
| 7 | 7 |
| 8 #include "CCDrawQuad.h" | 8 #include "CCDrawQuad.h" |
| 9 #include "cc/prioritized_texture_manager.h" | 9 #include "cc/prioritized_texture_manager.h" |
| 10 #include "cc/resource_provider.h" | 10 #include "cc/resource_provider.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 { | 36 { |
| 37 if (name == GL_EXTENSIONS) | 37 if (name == GL_EXTENSIONS) |
| 38 return WebString("GL_CHROMIUM_set_visibility GL_CHROMIUM_gpu_memory_
manager GL_CHROMIUM_discard_framebuffer"); | 38 return WebString("GL_CHROMIUM_set_visibility GL_CHROMIUM_gpu_memory_
manager GL_CHROMIUM_discard_framebuffer"); |
| 39 return WebString(); | 39 return WebString(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 // Methods added for test. | 42 // Methods added for test. |
| 43 int frameCount() { return m_frame; } | 43 int frameCount() { return m_frame; } |
| 44 void setMemoryAllocation(WebGraphicsMemoryAllocation allocation) | 44 void setMemoryAllocation(WebGraphicsMemoryAllocation allocation) |
| 45 { | 45 { |
| 46 DCHECK(Proxy::isImplThread()); | |
| 47 // In single threaded mode we expect this callback on main thread. | |
| 48 DebugScopedSetMainThread main; | |
| 49 m_memoryAllocationChangedCallback->onMemoryAllocationChanged(allocation)
; | 46 m_memoryAllocationChangedCallback->onMemoryAllocationChanged(allocation)
; |
| 50 } | 47 } |
| 51 | 48 |
| 52 private: | 49 private: |
| 53 int m_frame; | 50 int m_frame; |
| 54 WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* m_memoryAllocationChange
dCallback; | 51 WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* m_memoryAllocationChange
dCallback; |
| 55 }; | 52 }; |
| 56 | 53 |
| 57 class FakeRendererClient : public RendererClient { | 54 class FakeRendererClient : public RendererClient { |
| 58 public: | 55 public: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 81 int setFullRootLayerDamageCount() const { return m_setFullRootLayerDamageCou
nt; } | 78 int setFullRootLayerDamageCount() const { return m_setFullRootLayerDamageCou
nt; } |
| 82 | 79 |
| 83 RenderPass* rootRenderPass() { return m_renderPassesInDrawOrder.back(); } | 80 RenderPass* rootRenderPass() { return m_renderPassesInDrawOrder.back(); } |
| 84 const RenderPassList& renderPassesInDrawOrder() const { return m_renderPasse
sInDrawOrder; } | 81 const RenderPassList& renderPassesInDrawOrder() const { return m_renderPasse
sInDrawOrder; } |
| 85 const RenderPassIdHashMap& renderPasses() const { return m_renderPasses; } | 82 const RenderPassIdHashMap& renderPasses() const { return m_renderPasses; } |
| 86 | 83 |
| 87 size_t memoryAllocationLimitBytes() const { return m_memoryAllocationLimitBy
tes; } | 84 size_t memoryAllocationLimitBytes() const { return m_memoryAllocationLimitBy
tes; } |
| 88 | 85 |
| 89 private: | 86 private: |
| 90 int m_setFullRootLayerDamageCount; | 87 int m_setFullRootLayerDamageCount; |
| 91 DebugScopedSetImplThread m_implThread; | |
| 92 scoped_ptr<LayerImpl> m_rootLayer; | 88 scoped_ptr<LayerImpl> m_rootLayer; |
| 93 RenderPassList m_renderPassesInDrawOrder; | 89 RenderPassList m_renderPassesInDrawOrder; |
| 94 RenderPassIdHashMap m_renderPasses; | 90 RenderPassIdHashMap m_renderPasses; |
| 95 size_t m_memoryAllocationLimitBytes; | 91 size_t m_memoryAllocationLimitBytes; |
| 96 }; | 92 }; |
| 97 | 93 |
| 98 class FakeRendererGL : public GLRenderer { | 94 class FakeRendererGL : public GLRenderer { |
| 99 public: | 95 public: |
| 100 FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) :
GLRenderer(client, resourceProvider) { } | 96 FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) :
GLRenderer(client, resourceProvider, false) { } |
| 101 | 97 |
| 102 // GLRenderer methods. | 98 // GLRenderer methods. |
| 103 | 99 |
| 104 // Changing visibility to public. | 100 // Changing visibility to public. |
| 105 using GLRenderer::initialize; | 101 using GLRenderer::initialize; |
| 106 using GLRenderer::isFramebufferDiscarded; | 102 using GLRenderer::isFramebufferDiscarded; |
| 107 }; | 103 }; |
| 108 | 104 |
| 109 class GLRendererTest : public testing::Test { | 105 class GLRendererTest : public testing::Test { |
| 110 protected: | 106 protected: |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 FakeRendererGL renderer(&mockClient, resourceProvider.get()); | 415 FakeRendererGL renderer(&mockClient, resourceProvider.get()); |
| 420 | 416 |
| 421 mockClient.rootRenderPass()->setHasTransparentBackground(true); | 417 mockClient.rootRenderPass()->setHasTransparentBackground(true); |
| 422 | 418 |
| 423 EXPECT_TRUE(renderer.initialize()); | 419 EXPECT_TRUE(renderer.initialize()); |
| 424 | 420 |
| 425 renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPa
sses()); | 421 renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPa
sses()); |
| 426 | 422 |
| 427 EXPECT_EQ(1, context->clearCount()); | 423 EXPECT_EQ(1, context->clearCount()); |
| 428 } | 424 } |
| OLD | NEW |