diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 03:41:00 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 03:41:00 +0000 |
| commit | 05469638c90c61f273420773ab3139d4286a7fb0 (patch) | |
| tree | 06c32018843396f67cc7e71ef7ffecde9faec103 /cc/gl_renderer_unittest.cc | |
| parent | 658ce05d1f2ec2717f3c00c9b21934373010ca35 (diff) | |
| download | chromium_src-05469638c90c61f273420773ab3139d4286a7fb0.zip chromium_src-05469638c90c61f273420773ab3139d4286a7fb0.tar.gz chromium_src-05469638c90c61f273420773ab3139d4286a7fb0.tar.bz2 | |
cc: Implement DelegatingRender::drawFrame() method.
The method sends the render passes it is given to the parent compositor via
the output surface. It should include a valid frame metadata with it.
Tests:
DelegatingRendererTestDraw.runSingleThread
DelegatingRendererTestDraw.runMultiThread
DelegatingRendererTestResources.runSingleThread
DelegatingRendererTestResources.runMultiThread
R=piman
BUG=123444
Review URL: https://codereview.chromium.org/11777025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer_unittest.cc')
| -rw-r--r-- | cc/gl_renderer_unittest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc index 34f9972..89603b1 100644 --- a/cc/gl_renderer_unittest.cc +++ b/cc/gl_renderer_unittest.cc @@ -538,7 +538,7 @@ TEST(GLRendererTest2, activeTextureState) cc::RenderPass::Id id(1, 1); scoped_ptr<TestRenderPass> pass = TestRenderPass::Create(); pass->SetNew(id, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 100, 100), gfx::Transform()); - pass->AppendOneOfEveryQuadType(resourceProvider.get()); + pass->AppendOneOfEveryQuadType(resourceProvider.get(), RenderPass::Id(2, 1)); // Set up expected texture filter state transitions that match the quads // created in AppendOneOfEveryQuadType(). @@ -546,7 +546,7 @@ TEST(GLRendererTest2, activeTextureState) { InSequence sequence; - // yuv_quad is drawn with the default filter. + // yuv_quad is drawn with the default linear filter. EXPECT_CALL(*context, drawElements(_, _, _, _)); // tile_quad is drawn with GL_NEAREST because it is not transformed or @@ -556,8 +556,6 @@ TEST(GLRendererTest2, activeTextureState) EXPECT_CALL(*context, drawElements(_, _, _, _)); // transformed_tile_quad uses GL_LINEAR. - EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); - EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); EXPECT_CALL(*context, drawElements(_, _, _, _)); // scaled_tile_quad also uses GL_LINEAR. |