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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { | 102 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { |
103 output_surface_.reset(); | 103 output_surface_.reset(); |
104 compositor_.reset(); | 104 compositor_.reset(); |
105 ui::TerminateContextFactoryForTests(); | 105 ui::TerminateContextFactoryForTests(); |
106 } | 106 } |
107 | 107 |
108 std::unique_ptr<content::BrowserCompositorOutputSurface> | 108 std::unique_ptr<content::BrowserCompositorOutputSurface> |
109 SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface( | 109 SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface( |
110 std::unique_ptr<cc::SoftwareOutputDevice> device) { | 110 std::unique_ptr<cc::SoftwareOutputDevice> device) { |
111 return base::MakeUnique<content::SoftwareBrowserCompositorOutputSurface>( | 111 return base::MakeUnique<content::SoftwareBrowserCompositorOutputSurface>( |
112 std::move(device), compositor_->vsync_manager(), &begin_frame_source_); | 112 std::move(device), compositor_->vsync_manager(), &begin_frame_source_, |
| 113 base::ThreadTaskRunnerHandle::Get()); |
113 } | 114 } |
114 | 115 |
115 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) { | 116 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) { |
116 cc::FakeOutputSurfaceClient output_surface_client; | 117 cc::FakeOutputSurfaceClient output_surface_client; |
117 std::unique_ptr<cc::SoftwareOutputDevice> software_device( | 118 std::unique_ptr<cc::SoftwareOutputDevice> software_device( |
118 new cc::SoftwareOutputDevice()); | 119 new cc::SoftwareOutputDevice()); |
119 output_surface_ = CreateSurface(std::move(software_device)); | 120 output_surface_ = CreateSurface(std::move(software_device)); |
120 CHECK(output_surface_->BindToClient(&output_surface_client)); | 121 CHECK(output_surface_->BindToClient(&output_surface_client)); |
121 | 122 |
122 output_surface_->SwapBuffers(cc::OutputSurfaceFrame()); | 123 output_surface_->SwapBuffers(cc::OutputSurfaceFrame()); |
123 EXPECT_EQ(NULL, output_surface_->software_device()->GetVSyncProvider()); | 124 EXPECT_EQ(NULL, output_surface_->software_device()->GetVSyncProvider()); |
124 } | 125 } |
125 | 126 |
126 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) { | 127 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) { |
127 cc::FakeOutputSurfaceClient output_surface_client; | 128 cc::FakeOutputSurfaceClient output_surface_client; |
128 std::unique_ptr<cc::SoftwareOutputDevice> software_device( | 129 std::unique_ptr<cc::SoftwareOutputDevice> software_device( |
129 new FakeSoftwareOutputDevice()); | 130 new FakeSoftwareOutputDevice()); |
130 output_surface_ = CreateSurface(std::move(software_device)); | 131 output_surface_ = CreateSurface(std::move(software_device)); |
131 CHECK(output_surface_->BindToClient(&output_surface_client)); | 132 CHECK(output_surface_->BindToClient(&output_surface_client)); |
132 | 133 |
133 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( | 134 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( |
134 output_surface_->software_device()->GetVSyncProvider()); | 135 output_surface_->software_device()->GetVSyncProvider()); |
135 EXPECT_EQ(0, vsync_provider->call_count()); | 136 EXPECT_EQ(0, vsync_provider->call_count()); |
136 | 137 |
137 output_surface_->SwapBuffers(cc::OutputSurfaceFrame()); | 138 output_surface_->SwapBuffers(cc::OutputSurfaceFrame()); |
138 EXPECT_EQ(1, vsync_provider->call_count()); | 139 EXPECT_EQ(1, vsync_provider->call_count()); |
139 } | 140 } |
OLD | NEW |