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

Side by Side Diff: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

Issue 1040813002: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
OLDNEW
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/message_loop/message_loop.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"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(
105 scoped_ptr<cc::SoftwareOutputDevice> device) { 105 scoped_ptr<cc::SoftwareOutputDevice> device) {
106 return scoped_ptr<content::BrowserCompositorOutputSurface>( 106 return scoped_ptr<content::BrowserCompositorOutputSurface>(
107 new content::SoftwareBrowserCompositorOutputSurface(device.Pass())); 107 new content::SoftwareBrowserCompositorOutputSurface(
108 device.Pass(),
109 compositor_->vsync_manager()));
108 } 110 }
109 111
110 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) { 112 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {
111 cc::FakeOutputSurfaceClient output_surface_client; 113 cc::FakeOutputSurfaceClient output_surface_client;
112 scoped_ptr<cc::SoftwareOutputDevice> software_device( 114 scoped_ptr<cc::SoftwareOutputDevice> software_device(
113 new cc::SoftwareOutputDevice()); 115 new cc::SoftwareOutputDevice());
114 output_surface_ = CreateSurface(software_device.Pass()); 116 output_surface_ = CreateSurface(software_device.Pass());
115 CHECK(output_surface_->BindToClient(&output_surface_client)); 117 CHECK(output_surface_->BindToClient(&output_surface_client));
116 118
117 cc::CompositorFrame frame; 119 cc::CompositorFrame frame;
(...skipping 13 matching lines...) Expand all
131 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( 133 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
132 output_surface_->software_device()->GetVSyncProvider()); 134 output_surface_->software_device()->GetVSyncProvider());
133 EXPECT_EQ(0, vsync_provider->call_count()); 135 EXPECT_EQ(0, vsync_provider->call_count());
134 136
135 cc::CompositorFrame frame; 137 cc::CompositorFrame frame;
136 output_surface_->SwapBuffers(&frame); 138 output_surface_->SwapBuffers(&frame);
137 139
138 EXPECT_EQ(1, output_surface_client.swap_count()); 140 EXPECT_EQ(1, output_surface_client.swap_count());
139 EXPECT_EQ(1, vsync_provider->call_count()); 141 EXPECT_EQ(1, vsync_provider->call_count());
140 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698