summaryrefslogtreecommitdiffstats
path: root/cc/software_renderer_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'cc/software_renderer_unittest.cc')
-rw-r--r--cc/software_renderer_unittest.cc60
1 files changed, 30 insertions, 30 deletions
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index 8601e3f..790f84e 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -28,23 +28,23 @@ using namespace WebKitTests;
namespace {
-class CCRendererSoftwareTest : public testing::Test, public CCRendererClient {
+class SoftwareRendererTest : public testing::Test, public RendererClient {
public:
void initializeRenderer() {
m_outputSurface = FakeWebCompositorOutputSurface::createSoftware(scoped_ptr<WebKit::WebCompositorSoftwareOutputDevice>(new FakeWebCompositorSoftwareOutputDevice));
- m_resourceProvider = CCResourceProvider::create(m_outputSurface.get());
- m_renderer = CCRendererSoftware::create(this, resourceProvider(), softwareDevice());
+ m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
+ m_renderer = SoftwareRenderer::create(this, resourceProvider(), softwareDevice());
}
WebCompositorSoftwareOutputDevice* softwareDevice() const { return m_outputSurface->softwareDevice(); }
FakeWebCompositorOutputSurface* outputSurface() const { return m_outputSurface.get(); }
- CCResourceProvider* resourceProvider() const { return m_resourceProvider.get(); }
- CCRendererSoftware* renderer() const { return m_renderer.get(); }
+ ResourceProvider* resourceProvider() const { return m_resourceProvider.get(); }
+ SoftwareRenderer* renderer() const { return m_renderer.get(); }
void setViewportSize(IntSize viewportSize) { m_viewportSize = viewportSize; }
- // CCRendererClient implementation.
+ // RendererClient implementation.
virtual const IntSize& deviceViewportSize() const OVERRIDE { return m_viewportSize; }
- virtual const CCLayerTreeSettings& settings() const OVERRIDE { return m_settings; }
+ virtual const LayerTreeSettings& settings() const OVERRIDE { return m_settings; }
virtual void didLoseContext() OVERRIDE { }
virtual void onSwapBuffersComplete() OVERRIDE { }
virtual void setFullRootLayerDamage() OVERRIDE { }
@@ -55,13 +55,13 @@ protected:
DebugScopedSetImplThread m_alwaysImplThread;
scoped_ptr<FakeWebCompositorOutputSurface> m_outputSurface;
- scoped_ptr<CCResourceProvider> m_resourceProvider;
- scoped_ptr<CCRendererSoftware> m_renderer;
+ scoped_ptr<ResourceProvider> m_resourceProvider;
+ scoped_ptr<SoftwareRenderer> m_renderer;
IntSize m_viewportSize;
- CCLayerTreeSettings m_settings;
+ LayerTreeSettings m_settings;
};
-TEST_F(CCRendererSoftwareTest, solidColorQuad)
+TEST_F(SoftwareRendererTest, solidColorQuad)
{
IntSize outerSize(100, 100);
int outerPixels = outerSize.width() * outerSize.height();
@@ -72,17 +72,17 @@ TEST_F(CCRendererSoftwareTest, solidColorQuad)
initializeRenderer();
- scoped_ptr<CCSharedQuadState> sharedQuadState = CCSharedQuadState::create(WebTransformationMatrix(), outerRect, outerRect, 1.0, true);
- CCRenderPass::Id rootRenderPassId = CCRenderPass::Id(1, 1);
- scoped_ptr<CCRenderPass> rootRenderPass = CCTestRenderPass::create(rootRenderPassId, outerRect, WebTransformationMatrix());
- CCTestRenderPass* testRenderPass = static_cast<CCTestRenderPass*>(rootRenderPass.get());
- scoped_ptr<CCDrawQuad> outerQuad = CCSolidColorDrawQuad::create(sharedQuadState.get(), outerRect, SK_ColorYELLOW).PassAs<CCDrawQuad>();
- scoped_ptr<CCDrawQuad> innerQuad = CCSolidColorDrawQuad::create(sharedQuadState.get(), innerRect, SK_ColorCYAN).PassAs<CCDrawQuad>();
+ scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::create(WebTransformationMatrix(), outerRect, outerRect, 1.0, true);
+ RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1);
+ scoped_ptr<RenderPass> rootRenderPass = TestRenderPass::create(rootRenderPassId, outerRect, WebTransformationMatrix());
+ TestRenderPass* testRenderPass = static_cast<TestRenderPass*>(rootRenderPass.get());
+ scoped_ptr<DrawQuad> outerQuad = SolidColorDrawQuad::create(sharedQuadState.get(), outerRect, SK_ColorYELLOW).PassAs<DrawQuad>();
+ scoped_ptr<DrawQuad> innerQuad = SolidColorDrawQuad::create(sharedQuadState.get(), innerRect, SK_ColorCYAN).PassAs<DrawQuad>();
testRenderPass->appendQuad(innerQuad.Pass());
testRenderPass->appendQuad(outerQuad.Pass());
- CCRenderPassList list;
- CCRenderPassIdHashMap hashmap;
+ RenderPassList list;
+ RenderPassIdHashMap hashmap;
list.push_back(rootRenderPass.get());
hashmap.add(rootRenderPassId, rootRenderPass.Pass());
renderer()->drawFrame(list, hashmap);
@@ -102,7 +102,7 @@ TEST_F(CCRendererSoftwareTest, solidColorQuad)
#endif
}
-TEST_F(CCRendererSoftwareTest, tileQuad)
+TEST_F(SoftwareRendererTest, tileQuad)
{
IntSize outerSize(100, 100);
int outerPixels = outerSize.width() * outerSize.height();
@@ -113,8 +113,8 @@ TEST_F(CCRendererSoftwareTest, tileQuad)
setViewportSize(outerSize);
initializeRenderer();
- CCResourceProvider::ResourceId resourceYellow = resourceProvider()->createResource(1, outerSize, GL_RGBA, CCResourceProvider::TextureUsageAny);
- CCResourceProvider::ResourceId resourceCyan = resourceProvider()->createResource(1, innerSize, GL_RGBA, CCResourceProvider::TextureUsageAny);
+ ResourceProvider::ResourceId resourceYellow = resourceProvider()->createResource(1, outerSize, GL_RGBA, ResourceProvider::TextureUsageAny);
+ ResourceProvider::ResourceId resourceCyan = resourceProvider()->createResource(1, innerSize, GL_RGBA, ResourceProvider::TextureUsageAny);
SkColor yellow = SK_ColorYELLOW;
SkColor cyan = SK_ColorCYAN;
@@ -130,17 +130,17 @@ TEST_F(CCRendererSoftwareTest, tileQuad)
IntRect rect = IntRect(IntPoint(), deviceViewportSize());
- scoped_ptr<CCSharedQuadState> sharedQuadState = CCSharedQuadState::create(WebTransformationMatrix(), outerRect, outerRect, 1.0, true);
- CCRenderPass::Id rootRenderPassId = CCRenderPass::Id(1, 1);
- scoped_ptr<CCRenderPass> rootRenderPass = CCTestRenderPass::create(rootRenderPassId, IntRect(IntPoint(), deviceViewportSize()), WebTransformationMatrix());
- CCTestRenderPass* testRenderPass = static_cast<CCTestRenderPass*>(rootRenderPass.get());
- scoped_ptr<CCDrawQuad> outerQuad = CCTileDrawQuad::create(sharedQuadState.get(), outerRect, outerRect, resourceYellow, IntPoint(), outerSize, 0, false, false, false, false, false).PassAs<CCDrawQuad>();
- scoped_ptr<CCDrawQuad> innerQuad = CCTileDrawQuad::create(sharedQuadState.get(), innerRect, innerRect, resourceCyan, IntPoint(), innerSize, 0, false, false, false, false, false).PassAs<CCDrawQuad>();
+ scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::create(WebTransformationMatrix(), outerRect, outerRect, 1.0, true);
+ RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1);
+ scoped_ptr<RenderPass> rootRenderPass = TestRenderPass::create(rootRenderPassId, IntRect(IntPoint(), deviceViewportSize()), WebTransformationMatrix());
+ TestRenderPass* testRenderPass = static_cast<TestRenderPass*>(rootRenderPass.get());
+ scoped_ptr<DrawQuad> outerQuad = TileDrawQuad::create(sharedQuadState.get(), outerRect, outerRect, resourceYellow, IntPoint(), outerSize, 0, false, false, false, false, false).PassAs<DrawQuad>();
+ scoped_ptr<DrawQuad> innerQuad = TileDrawQuad::create(sharedQuadState.get(), innerRect, innerRect, resourceCyan, IntPoint(), innerSize, 0, false, false, false, false, false).PassAs<DrawQuad>();
testRenderPass->appendQuad(innerQuad.Pass());
testRenderPass->appendQuad(outerQuad.Pass());
- CCRenderPassList list;
- CCRenderPassIdHashMap hashmap;
+ RenderPassList list;
+ RenderPassIdHashMap hashmap;
list.push_back(rootRenderPass.get());
hashmap.add(rootRenderPassId, rootRenderPass.Pass());
renderer()->drawFrame(list, hashmap);
generated by cgit v1.1 at 2025-05-21 05:55:42 +0000