Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: cc/output/gl_renderer_unittest.cc

Issue 467183003: Minor scoped_refptr cleanup in cc::OutputSurface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: With raw pointer Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | cc/output/output_surface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/output/gl_renderer.h" 5 #include "cc/output/gl_renderer.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "cc/base/math_util.h" 9 #include "cc/base/math_util.h"
10 #include "cc/output/compositor_frame_metadata.h" 10 #include "cc/output/compositor_frame_metadata.h"
(...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1640 render_passes_in_draw_order_); 1640 render_passes_in_draw_order_);
1641 renderer_->DrawFrame(&render_passes_in_draw_order_, 1641 renderer_->DrawFrame(&render_passes_in_draw_order_,
1642 device_scale_factor, 1642 device_scale_factor,
1643 device_viewport_rect, 1643 device_viewport_rect,
1644 device_viewport_rect, 1644 device_viewport_rect,
1645 false); 1645 false);
1646 } 1646 }
1647 1647
1648 OutputSurfaceMockContext* Context() { 1648 OutputSurfaceMockContext* Context() {
1649 return static_cast<OutputSurfaceMockContext*>( 1649 return static_cast<OutputSurfaceMockContext*>(
1650 static_cast<TestContextProvider*>( 1650 static_cast<TestContextProvider*>(output_surface_.context_provider())
1651 output_surface_.context_provider().get())->TestContext3d()); 1651 ->TestContext3d());
1652 } 1652 }
1653 1653
1654 LayerTreeSettings settings_; 1654 LayerTreeSettings settings_;
1655 FakeOutputSurfaceClient output_surface_client_; 1655 FakeOutputSurfaceClient output_surface_client_;
1656 StrictMock<MockOutputSurface> output_surface_; 1656 StrictMock<MockOutputSurface> output_surface_;
1657 scoped_ptr<SharedBitmapManager> shared_bitmap_manager_; 1657 scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
1658 scoped_ptr<ResourceProvider> resource_provider_; 1658 scoped_ptr<ResourceProvider> resource_provider_;
1659 FakeRendererClient renderer_client_; 1659 FakeRendererClient renderer_client_;
1660 scoped_ptr<FakeRendererGL> renderer_; 1660 scoped_ptr<FakeRendererGL> renderer_;
1661 }; 1661 };
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 base::MessageLoop::current()->Run(); 1762 base::MessageLoop::current()->Run();
1763 1763
1764 // The sync point should have happened. 1764 // The sync point should have happened.
1765 EXPECT_EQ(1, sync_point_callback_count); 1765 EXPECT_EQ(1, sync_point_callback_count);
1766 EXPECT_EQ(1, other_callback_count); 1766 EXPECT_EQ(1, other_callback_count);
1767 } 1767 }
1768 #endif // OS_ANDROID 1768 #endif // OS_ANDROID
1769 1769
1770 } // namespace 1770 } // namespace
1771 } // namespace cc 1771 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/output/output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698