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

Unified Diff: cc/output/gl_renderer_unittest.cc

Issue 14999012: Move cc/debug/latency_info to ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 7e1a4384fcab50c829f8db50ef4efb62ae1a7408..48a595116e01b2e73fd07b847ffdfe4723e18a8c 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -268,7 +268,7 @@ class GLRendererTest : public testing::Test {
virtual void SetUp() { renderer_.Initialize(); }
- void SwapBuffers() { renderer_.SwapBuffers(LatencyInfo()); }
+ void SwapBuffers() { renderer_.SwapBuffers(ui::LatencyInfo()); }
FrameCountingMemoryAllocationSettingContext* Context() {
return static_cast<FrameCountingMemoryAllocationSettingContext*>(
@@ -1482,8 +1482,8 @@ class MockOutputSurface : public OutputSurface {
MOCK_METHOD0(DiscardBackbuffer, void());
MOCK_METHOD2(Reshape, void(gfx::Size size, float scale_factor));
MOCK_METHOD0(BindFramebuffer, void());
- MOCK_METHOD2(PostSubBuffer, void(gfx::Rect rect, const LatencyInfo&));
- MOCK_METHOD1(SwapBuffers, void(const LatencyInfo&));
+ MOCK_METHOD2(PostSubBuffer, void(gfx::Rect rect, const ui::LatencyInfo&));
+ MOCK_METHOD1(SwapBuffers, void(const ui::LatencyInfo&));
};
class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient {
@@ -1494,7 +1494,7 @@ class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient {
virtual void SetUp() { EXPECT_TRUE(renderer_.Initialize()); }
- void SwapBuffers() { renderer_.SwapBuffers(LatencyInfo()); }
+ void SwapBuffers() { renderer_.SwapBuffers(ui::LatencyInfo()); }
void DrawFrame() {
gfx::Rect viewport_rect(DeviceViewportSize());
@@ -1536,31 +1536,31 @@ TEST_F(MockOutputSurfaceTest, DrawFrameAndSwap) {
DrawFrame();
EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
- renderer_.SwapBuffers(LatencyInfo());
+ renderer_.SwapBuffers(ui::LatencyInfo());
}
TEST_F(MockOutputSurfaceTest, DrawFrameAndResizeAndSwap) {
DrawFrame();
EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
- renderer_.SwapBuffers(LatencyInfo());
+ renderer_.SwapBuffers(ui::LatencyInfo());
set_viewport_and_scale(gfx::Size(2, 2), 2.f);
renderer_.ViewportChanged();
DrawFrame();
EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
- renderer_.SwapBuffers(LatencyInfo());
+ renderer_.SwapBuffers(ui::LatencyInfo());
DrawFrame();
EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
- renderer_.SwapBuffers(LatencyInfo());
+ renderer_.SwapBuffers(ui::LatencyInfo());
set_viewport_and_scale(gfx::Size(1, 1), 1.f);
renderer_.ViewportChanged();
DrawFrame();
EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
- renderer_.SwapBuffers(LatencyInfo());
+ renderer_.SwapBuffers(ui::LatencyInfo());
}
class MockOutputSurfaceTestWithPartialSwap : public MockOutputSurfaceTest {
@@ -1576,7 +1576,7 @@ TEST_F(MockOutputSurfaceTestWithPartialSwap, DrawFrameAndSwap) {
DrawFrame();
EXPECT_CALL(output_surface_, PostSubBuffer(_, _)).Times(1);
- renderer_.SwapBuffers(LatencyInfo());
+ renderer_.SwapBuffers(ui::LatencyInfo());
}
class MockOutputSurfaceTestWithSendCompositorFrame
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698