OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/compositor/software_browser_compositor_output_surface.
h" | 5 #include "content/browser/compositor/software_browser_compositor_output_surface.
h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 class FakeSoftwareOutputDevice : public cc::SoftwareOutputDevice { | 44 class FakeSoftwareOutputDevice : public cc::SoftwareOutputDevice { |
45 public: | 45 public: |
46 FakeSoftwareOutputDevice() : vsync_provider_(new FakeVSyncProvider()) {} | 46 FakeSoftwareOutputDevice() : vsync_provider_(new FakeVSyncProvider()) {} |
47 ~FakeSoftwareOutputDevice() override {} | 47 ~FakeSoftwareOutputDevice() override {} |
48 | 48 |
49 gfx::VSyncProvider* GetVSyncProvider() override { | 49 gfx::VSyncProvider* GetVSyncProvider() override { |
50 return vsync_provider_.get(); | 50 return vsync_provider_.get(); |
51 } | 51 } |
52 | 52 |
53 private: | 53 private: |
54 scoped_ptr<gfx::VSyncProvider> vsync_provider_; | 54 std::unique_ptr<gfx::VSyncProvider> vsync_provider_; |
55 | 55 |
56 DISALLOW_COPY_AND_ASSIGN(FakeSoftwareOutputDevice); | 56 DISALLOW_COPY_AND_ASSIGN(FakeSoftwareOutputDevice); |
57 }; | 57 }; |
58 | 58 |
59 } // namespace | 59 } // namespace |
60 | 60 |
61 class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test { | 61 class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test { |
62 public: | 62 public: |
63 SoftwareBrowserCompositorOutputSurfaceTest(); | 63 SoftwareBrowserCompositorOutputSurfaceTest(); |
64 ~SoftwareBrowserCompositorOutputSurfaceTest() override; | 64 ~SoftwareBrowserCompositorOutputSurfaceTest() override; |
65 | 65 |
66 void SetUp() override; | 66 void SetUp() override; |
67 void TearDown() override; | 67 void TearDown() override; |
68 | 68 |
69 scoped_ptr<content::BrowserCompositorOutputSurface> CreateSurface( | 69 std::unique_ptr<content::BrowserCompositorOutputSurface> CreateSurface( |
70 scoped_ptr<cc::SoftwareOutputDevice> device); | 70 std::unique_ptr<cc::SoftwareOutputDevice> device); |
71 | 71 |
72 protected: | 72 protected: |
73 scoped_ptr<content::BrowserCompositorOutputSurface> output_surface_; | 73 std::unique_ptr<content::BrowserCompositorOutputSurface> output_surface_; |
74 | 74 |
75 scoped_ptr<base::MessageLoop> message_loop_; | 75 std::unique_ptr<base::MessageLoop> message_loop_; |
76 scoped_ptr<ui::Compositor> compositor_; | 76 std::unique_ptr<ui::Compositor> compositor_; |
77 | 77 |
78 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurfaceTest); | 78 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurfaceTest); |
79 }; | 79 }; |
80 | 80 |
81 SoftwareBrowserCompositorOutputSurfaceTest:: | 81 SoftwareBrowserCompositorOutputSurfaceTest:: |
82 SoftwareBrowserCompositorOutputSurfaceTest() { | 82 SoftwareBrowserCompositorOutputSurfaceTest() { |
83 // |message_loop_| is not used, but the main thread still has to exist for the | 83 // |message_loop_| is not used, but the main thread still has to exist for the |
84 // compositor to use. | 84 // compositor to use. |
85 message_loop_.reset(new base::MessageLoopForUI); | 85 message_loop_.reset(new base::MessageLoopForUI); |
86 } | 86 } |
(...skipping 10 matching lines...) Expand all Loading... |
97 new ui::Compositor(context_factory, base::ThreadTaskRunnerHandle::Get())); | 97 new ui::Compositor(context_factory, base::ThreadTaskRunnerHandle::Get())); |
98 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); | 98 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); |
99 } | 99 } |
100 | 100 |
101 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { | 101 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { |
102 output_surface_.reset(); | 102 output_surface_.reset(); |
103 compositor_.reset(); | 103 compositor_.reset(); |
104 ui::TerminateContextFactoryForTests(); | 104 ui::TerminateContextFactoryForTests(); |
105 } | 105 } |
106 | 106 |
107 scoped_ptr<content::BrowserCompositorOutputSurface> | 107 std::unique_ptr<content::BrowserCompositorOutputSurface> |
108 SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface( | 108 SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface( |
109 scoped_ptr<cc::SoftwareOutputDevice> device) { | 109 std::unique_ptr<cc::SoftwareOutputDevice> device) { |
110 return scoped_ptr<content::BrowserCompositorOutputSurface>( | 110 return std::unique_ptr<content::BrowserCompositorOutputSurface>( |
111 new content::SoftwareBrowserCompositorOutputSurface( | 111 new content::SoftwareBrowserCompositorOutputSurface( |
112 std::move(device), compositor_->vsync_manager())); | 112 std::move(device), compositor_->vsync_manager())); |
113 } | 113 } |
114 | 114 |
115 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) { | 115 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) { |
116 cc::FakeOutputSurfaceClient output_surface_client; | 116 cc::FakeOutputSurfaceClient output_surface_client; |
117 scoped_ptr<cc::SoftwareOutputDevice> software_device( | 117 std::unique_ptr<cc::SoftwareOutputDevice> software_device( |
118 new cc::SoftwareOutputDevice()); | 118 new cc::SoftwareOutputDevice()); |
119 output_surface_ = CreateSurface(std::move(software_device)); | 119 output_surface_ = CreateSurface(std::move(software_device)); |
120 CHECK(output_surface_->BindToClient(&output_surface_client)); | 120 CHECK(output_surface_->BindToClient(&output_surface_client)); |
121 | 121 |
122 cc::CompositorFrame frame; | 122 cc::CompositorFrame frame; |
123 output_surface_->SwapBuffers(&frame); | 123 output_surface_->SwapBuffers(&frame); |
124 | 124 |
125 EXPECT_EQ(1, output_surface_client.swap_count()); | 125 EXPECT_EQ(1, output_surface_client.swap_count()); |
126 EXPECT_EQ(NULL, output_surface_->software_device()->GetVSyncProvider()); | 126 EXPECT_EQ(NULL, output_surface_->software_device()->GetVSyncProvider()); |
127 } | 127 } |
128 | 128 |
129 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) { | 129 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) { |
130 cc::FakeOutputSurfaceClient output_surface_client; | 130 cc::FakeOutputSurfaceClient output_surface_client; |
131 scoped_ptr<cc::SoftwareOutputDevice> software_device( | 131 std::unique_ptr<cc::SoftwareOutputDevice> software_device( |
132 new FakeSoftwareOutputDevice()); | 132 new FakeSoftwareOutputDevice()); |
133 output_surface_ = CreateSurface(std::move(software_device)); | 133 output_surface_ = CreateSurface(std::move(software_device)); |
134 CHECK(output_surface_->BindToClient(&output_surface_client)); | 134 CHECK(output_surface_->BindToClient(&output_surface_client)); |
135 | 135 |
136 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( | 136 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( |
137 output_surface_->software_device()->GetVSyncProvider()); | 137 output_surface_->software_device()->GetVSyncProvider()); |
138 EXPECT_EQ(0, vsync_provider->call_count()); | 138 EXPECT_EQ(0, vsync_provider->call_count()); |
139 | 139 |
140 cc::CompositorFrame frame; | 140 cc::CompositorFrame frame; |
141 output_surface_->SwapBuffers(&frame); | 141 output_surface_->SwapBuffers(&frame); |
142 | 142 |
143 EXPECT_EQ(1, output_surface_client.swap_count()); | 143 EXPECT_EQ(1, output_surface_client.swap_count()); |
144 EXPECT_EQ(1, vsync_provider->call_count()); | 144 EXPECT_EQ(1, vsync_provider->call_count()); |
145 } | 145 } |
OLD | NEW |