#include "base/message_loop/message_loop.h"
#include "cc/output/compositor_frame.h"
+#include "cc/test/fake_output_surface_client.h"
#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
#include "content/browser/compositor/software_browser_compositor_output_surface.h"
#include "testing/gtest/include/gtest/gtest.h"
class FakeVSyncProvider : public gfx::VSyncProvider {
public:
FakeVSyncProvider() : call_count_(0) {}
- virtual ~FakeVSyncProvider() {}
+ ~FakeVSyncProvider() override {}
- virtual void GetVSyncParameters(const UpdateVSyncCallback& callback)
- OVERRIDE {
+ void GetVSyncParameters(const UpdateVSyncCallback& callback) override {
callback.Run(timebase_, interval_);
call_count_++;
}
class FakeSoftwareOutputDevice : public cc::SoftwareOutputDevice {
public:
FakeSoftwareOutputDevice() : vsync_provider_(new FakeVSyncProvider()) {}
- virtual ~FakeSoftwareOutputDevice() {}
+ ~FakeSoftwareOutputDevice() override {}
- virtual gfx::VSyncProvider* GetVSyncProvider() OVERRIDE {
+ gfx::VSyncProvider* GetVSyncProvider() override {
return vsync_provider_.get();
}
class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test {
public:
SoftwareBrowserCompositorOutputSurfaceTest();
- virtual ~SoftwareBrowserCompositorOutputSurfaceTest();
+ ~SoftwareBrowserCompositorOutputSurfaceTest() override;
- virtual void SetUp() OVERRIDE;
- virtual void TearDown() OVERRIDE;
+ void SetUp() override;
+ void TearDown() override;
scoped_ptr<content::BrowserCompositorOutputSurface> CreateSurface(
scoped_ptr<cc::SoftwareOutputDevice> device);
void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() {
bool enable_pixel_output = false;
- ui::InitializeContextFactoryForTests(enable_pixel_output);
- ui::Compositor::Initialize();
+ ui::ContextFactory* context_factory =
+ ui::InitializeContextFactoryForTests(enable_pixel_output);
- compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget));
+ compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget,
+ context_factory,
+ base::MessageLoopProxy::current()));
surface_proxy_ =
new content::BrowserCompositorOutputSurfaceProxy(&surface_map_);
}
surface_map_.Clear();
ui::TerminateContextFactoryForTests();
- ui::Compositor::Terminate();
}
scoped_ptr<content::BrowserCompositorOutputSurface>
}
TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {
+ cc::FakeOutputSurfaceClient output_surface_client;
scoped_ptr<cc::SoftwareOutputDevice> software_device(
new cc::SoftwareOutputDevice());
output_surface_ = CreateSurface(software_device.Pass());
+ CHECK(output_surface_->BindToClient(&output_surface_client));
cc::CompositorFrame frame;
output_surface_->SwapBuffers(&frame);
+ EXPECT_EQ(1, output_surface_client.swap_count());
EXPECT_EQ(NULL, output_surface_->software_device()->GetVSyncProvider());
}
TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) {
+ cc::FakeOutputSurfaceClient output_surface_client;
scoped_ptr<cc::SoftwareOutputDevice> software_device(
new FakeSoftwareOutputDevice());
output_surface_ = CreateSurface(software_device.Pass());
+ CHECK(output_surface_->BindToClient(&output_surface_client));
FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
output_surface_->software_device()->GetVSyncProvider());
cc::CompositorFrame frame;
output_surface_->SwapBuffers(&frame);
+ EXPECT_EQ(1, output_surface_client.swap_count());
EXPECT_EQ(1, vsync_provider->call_count());
}