| 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 "base/message_loop/message_loop.h" | 5 #include "base/thread_task_runner_handle.h" |
| 6 #include "cc/output/compositor_frame.h" | 6 #include "cc/output/compositor_frame.h" |
| 7 #include "cc/test/fake_output_surface_client.h" | 7 #include "cc/test/fake_output_surface_client.h" |
| 8 #include "content/browser/compositor/software_browser_compositor_output_surface.
h" | 8 #include "content/browser/compositor/software_browser_compositor_output_surface.
h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "ui/compositor/compositor.h" | 10 #include "ui/compositor/compositor.h" |
| 11 #include "ui/compositor/test/context_factories_for_test.h" | 11 #include "ui/compositor/test/context_factories_for_test.h" |
| 12 #include "ui/gfx/vsync_provider.h" | 12 #include "ui/gfx/vsync_provider.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 SoftwareBrowserCompositorOutputSurfaceTest:: | 84 SoftwareBrowserCompositorOutputSurfaceTest:: |
| 85 ~SoftwareBrowserCompositorOutputSurfaceTest() {} | 85 ~SoftwareBrowserCompositorOutputSurfaceTest() {} |
| 86 | 86 |
| 87 void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() { | 87 void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() { |
| 88 bool enable_pixel_output = false; | 88 bool enable_pixel_output = false; |
| 89 ui::ContextFactory* context_factory = | 89 ui::ContextFactory* context_factory = |
| 90 ui::InitializeContextFactoryForTests(enable_pixel_output); | 90 ui::InitializeContextFactoryForTests(enable_pixel_output); |
| 91 | 91 |
| 92 compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget, | 92 compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget, |
| 93 context_factory, | 93 context_factory, |
| 94 base::MessageLoopProxy::current())); | 94 base::ThreadTaskRunnerHandle::Get())); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { | 97 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { |
| 98 output_surface_.reset(); | 98 output_surface_.reset(); |
| 99 compositor_.reset(); | 99 compositor_.reset(); |
| 100 ui::TerminateContextFactoryForTests(); | 100 ui::TerminateContextFactoryForTests(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 scoped_ptr<content::BrowserCompositorOutputSurface> | 103 scoped_ptr<content::BrowserCompositorOutputSurface> |
| 104 SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface( | 104 SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface( |
| (...skipping 28 matching lines...) Expand all Loading... |
| 133 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( | 133 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( |
| 134 output_surface_->software_device()->GetVSyncProvider()); | 134 output_surface_->software_device()->GetVSyncProvider()); |
| 135 EXPECT_EQ(0, vsync_provider->call_count()); | 135 EXPECT_EQ(0, vsync_provider->call_count()); |
| 136 | 136 |
| 137 cc::CompositorFrame frame; | 137 cc::CompositorFrame frame; |
| 138 output_surface_->SwapBuffers(&frame); | 138 output_surface_->SwapBuffers(&frame); |
| 139 | 139 |
| 140 EXPECT_EQ(1, output_surface_client.swap_count()); | 140 EXPECT_EQ(1, output_surface_client.swap_count()); |
| 141 EXPECT_EQ(1, vsync_provider->call_count()); | 141 EXPECT_EQ(1, vsync_provider->call_count()); |
| 142 } | 142 } |
| OLD | NEW |