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

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

Issue 2096493002: Make cc::CompositorFrames movable [Part 1 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Dana's nits Created 4 years, 5 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 | « cc/output/gl_renderer.cc ('k') | 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include <set> 9 #include <set>
10 10
(...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 surface_size_ = gfx::Size(100, 100); 1773 surface_size_ = gfx::Size(100, 100);
1774 } 1774 }
1775 virtual ~MockOutputSurface() {} 1775 virtual ~MockOutputSurface() {}
1776 1776
1777 MOCK_METHOD0(EnsureBackbuffer, void()); 1777 MOCK_METHOD0(EnsureBackbuffer, void());
1778 MOCK_METHOD0(DiscardBackbuffer, void()); 1778 MOCK_METHOD0(DiscardBackbuffer, void());
1779 MOCK_METHOD3(Reshape, 1779 MOCK_METHOD3(Reshape,
1780 void(const gfx::Size& size, float scale_factor, bool has_alpha)); 1780 void(const gfx::Size& size, float scale_factor, bool has_alpha));
1781 MOCK_METHOD0(BindFramebuffer, void()); 1781 MOCK_METHOD0(BindFramebuffer, void());
1782 MOCK_METHOD0(GetFramebufferCopyTextureFormat, GLenum()); 1782 MOCK_METHOD0(GetFramebufferCopyTextureFormat, GLenum());
1783 MOCK_METHOD1(SwapBuffers, void(CompositorFrame* frame)); 1783 MOCK_METHOD1(SwapBuffers_, void(CompositorFrame& frame));
1784 void SwapBuffers(CompositorFrame frame) override { SwapBuffers_(frame); }
1784 }; 1785 };
1785 1786
1786 class MockOutputSurfaceTest : public GLRendererTest { 1787 class MockOutputSurfaceTest : public GLRendererTest {
1787 protected: 1788 protected:
1788 virtual void SetUp() { 1789 virtual void SetUp() {
1789 FakeOutputSurfaceClient output_surface_client_; 1790 FakeOutputSurfaceClient output_surface_client_;
1790 CHECK(output_surface_.BindToClient(&output_surface_client_)); 1791 CHECK(output_surface_.BindToClient(&output_surface_client_));
1791 1792
1792 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 1793 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
1793 resource_provider_ = FakeResourceProvider::Create( 1794 resource_provider_ = FakeResourceProvider::Create(
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1842 std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_; 1843 std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
1843 std::unique_ptr<ResourceProvider> resource_provider_; 1844 std::unique_ptr<ResourceProvider> resource_provider_;
1844 FakeRendererClient renderer_client_; 1845 FakeRendererClient renderer_client_;
1845 std::unique_ptr<FakeRendererGL> renderer_; 1846 std::unique_ptr<FakeRendererGL> renderer_;
1846 }; 1847 };
1847 1848
1848 TEST_F(MockOutputSurfaceTest, DrawFrameAndSwap) { 1849 TEST_F(MockOutputSurfaceTest, DrawFrameAndSwap) {
1849 gfx::Rect device_viewport_rect(1, 1); 1850 gfx::Rect device_viewport_rect(1, 1);
1850 DrawFrame(1.f, device_viewport_rect, true); 1851 DrawFrame(1.f, device_viewport_rect, true);
1851 1852
1852 EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); 1853 EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
1853 renderer_->SwapBuffers(CompositorFrameMetadata()); 1854 renderer_->SwapBuffers(CompositorFrameMetadata());
1854 } 1855 }
1855 1856
1856 TEST_F(MockOutputSurfaceTest, DrawOpaqueFrameAndSwap) { 1857 TEST_F(MockOutputSurfaceTest, DrawOpaqueFrameAndSwap) {
1857 gfx::Rect device_viewport_rect(1, 1); 1858 gfx::Rect device_viewport_rect(1, 1);
1858 DrawFrame(1.f, device_viewport_rect, false); 1859 DrawFrame(1.f, device_viewport_rect, false);
1859 1860
1860 EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); 1861 EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
1861 renderer_->SwapBuffers(CompositorFrameMetadata()); 1862 renderer_->SwapBuffers(CompositorFrameMetadata());
1862 } 1863 }
1863 1864
1864 TEST_F(MockOutputSurfaceTest, DrawFrameAndResizeAndSwap) { 1865 TEST_F(MockOutputSurfaceTest, DrawFrameAndResizeAndSwap) {
1865 gfx::Rect device_viewport_rect(1, 1); 1866 gfx::Rect device_viewport_rect(1, 1);
1866 1867
1867 DrawFrame(1.f, device_viewport_rect, true); 1868 DrawFrame(1.f, device_viewport_rect, true);
1868 EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); 1869 EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
1869 renderer_->SwapBuffers(CompositorFrameMetadata()); 1870 renderer_->SwapBuffers(CompositorFrameMetadata());
1870 1871
1871 device_viewport_rect = gfx::Rect(2, 2); 1872 device_viewport_rect = gfx::Rect(2, 2);
1872 1873
1873 DrawFrame(2.f, device_viewport_rect, true); 1874 DrawFrame(2.f, device_viewport_rect, true);
1874 EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); 1875 EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
1875 renderer_->SwapBuffers(CompositorFrameMetadata()); 1876 renderer_->SwapBuffers(CompositorFrameMetadata());
1876 1877
1877 DrawFrame(2.f, device_viewport_rect, true); 1878 DrawFrame(2.f, device_viewport_rect, true);
1878 EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); 1879 EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
1879 renderer_->SwapBuffers(CompositorFrameMetadata()); 1880 renderer_->SwapBuffers(CompositorFrameMetadata());
1880 1881
1881 device_viewport_rect = gfx::Rect(1, 1); 1882 device_viewport_rect = gfx::Rect(1, 1);
1882 1883
1883 DrawFrame(1.f, device_viewport_rect, true); 1884 DrawFrame(1.f, device_viewport_rect, true);
1884 EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); 1885 EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
1885 renderer_->SwapBuffers(CompositorFrameMetadata()); 1886 renderer_->SwapBuffers(CompositorFrameMetadata());
1886 } 1887 }
1887 1888
1888 class TestOverlayProcessor : public OverlayProcessor { 1889 class TestOverlayProcessor : public OverlayProcessor {
1889 public: 1890 public:
1890 class Strategy : public OverlayProcessor::Strategy { 1891 class Strategy : public OverlayProcessor::Strategy {
1891 public: 1892 public:
1892 Strategy() {} 1893 Strategy() {}
1893 ~Strategy() override {} 1894 ~Strategy() override {}
1894 MOCK_METHOD3(Attempt, 1895 MOCK_METHOD3(Attempt,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 EXPECT_CALL(overlay_scheduler, 2156 EXPECT_CALL(overlay_scheduler,
2156 Schedule(1, gfx::OVERLAY_TRANSFORM_NONE, _, viewport_rect, 2157 Schedule(1, gfx::OVERLAY_TRANSFORM_NONE, _, viewport_rect,
2157 BoundingRect(uv_top_left, uv_bottom_right))).Times(1); 2158 BoundingRect(uv_top_left, uv_bottom_right))).Times(1);
2158 2159
2159 renderer.DrawFrame(&render_passes_in_draw_order_, 1.f, viewport_rect, 2160 renderer.DrawFrame(&render_passes_in_draw_order_, 1.f, viewport_rect,
2160 viewport_rect, false); 2161 viewport_rect, false);
2161 } 2162 }
2162 2163
2163 } // namespace 2164 } // namespace
2164 } // namespace cc 2165 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698