diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 19:48:56 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 19:48:56 +0000 |
| commit | 3b2eb8890490df87ed957ba5076bcb5a39832c3c (patch) | |
| tree | 69f90778f6a6a5b14da80bbaf886bfec97783b88 /cc/output/overlay_unittest.cc | |
| parent | 1502e60861419bd0499f9b52a11b90fc55dc1abc (diff) | |
| download | chromium_src-3b2eb8890490df87ed957ba5076bcb5a39832c3c.zip chromium_src-3b2eb8890490df87ed957ba5076bcb5a39832c3c.tar.gz chromium_src-3b2eb8890490df87ed957ba5076bcb5a39832c3c.tar.bz2 | |
Remove offscreen compositor contexts.
After https://codereview.chromium.org/250083002/ cc no longer uses an
offscreen context for ganesh filters. Instead using the main onscreen
context.
So, delete the code to create offscreen contexts for the compositor.
R=abarth@chromium.org, boliu@chromium.org, enne@chromium.org, piman@chromium.org, enne, piman
BUG=366132,366130
Review URL: https://codereview.chromium.org/251343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/overlay_unittest.cc')
| -rw-r--r-- | cc/output/overlay_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc index a6bc3d7..3b0c65a 100644 --- a/cc/output/overlay_unittest.cc +++ b/cc/output/overlay_unittest.cc @@ -569,8 +569,7 @@ TEST_F(GLRendererWithOverlaysTest, OverlayQuadNotDrawn) { _, kOverlayRect, BoundingRect(kUVTopLeft, kUVBottomRight))).Times(1); - renderer_->DrawFrame( - &pass_list, NULL, 1.f, viewport_rect, viewport_rect, false); + renderer_->DrawFrame(&pass_list, 1.f, viewport_rect, viewport_rect, false); SwapBuffers(); @@ -602,8 +601,7 @@ TEST_F(GLRendererWithOverlaysTest, OccludedQuadDrawn) { // 3 quads in the pass, all should draw. EXPECT_CALL(*renderer_, DoDrawQuad(_, _)).Times(3); EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(0); - renderer_->DrawFrame( - &pass_list, NULL, 1.f, viewport_rect, viewport_rect, false); + renderer_->DrawFrame(&pass_list, 1.f, viewport_rect, viewport_rect, false); SwapBuffers(); @@ -635,8 +633,7 @@ TEST_F(GLRendererWithOverlaysTest, NoValidatorNoOverlay) { // Should see no overlays. EXPECT_CALL(*renderer_, DoDrawQuad(_, _)).Times(3); EXPECT_CALL(scheduler_, Schedule(_, _, _, _, _)).Times(0); - renderer_->DrawFrame( - &pass_list, NULL, 1.f, viewport_rect, viewport_rect, false); + renderer_->DrawFrame(&pass_list, 1.f, viewport_rect, viewport_rect, false); SwapBuffers(); |