ui/compositor/compositor_unittest.cc - Issue 2708153005: Rename SurfaceIdAllocator to LocalSurfaceIdAllocator

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/compositor/compositor_unittest.cc

Issue 2708153005: Rename SurfaceIdAllocator to LocalSurfaceIdAllocator (Closed)

Patch Set: Delete useless include Created 3 years, 9 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

« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/in_process_context_factory.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 <stdint.h>	5 #include <stdint.h>

6	6

7 #include "base/macros.h"	7 #include "base/macros.h"

8 #include "base/run_loop.h"	8 #include "base/run_loop.h"

9 #include "base/threading/thread_task_runner_handle.h"	9 #include "base/threading/thread_task_runner_handle.h"

10 #include "cc/output/begin_frame_args.h"	10 #include "cc/output/begin_frame_args.h"

	11 #include "cc/surfaces/local_surface_id_allocator.h"

11 #include "cc/surfaces/surface_factory.h"	12 #include "cc/surfaces/surface_factory.h"

12 #include "cc/surfaces/surface_factory_client.h"	13 #include "cc/surfaces/surface_factory_client.h"

13 #include "cc/surfaces/surface_id_allocator.h"

14 #include "cc/surfaces/surface_manager.h"	14 #include "cc/surfaces/surface_manager.h"

15 #include "cc/test/begin_frame_args_test.h"	15 #include "cc/test/begin_frame_args_test.h"

16 #include "testing/gmock/include/gmock/gmock.h"	16 #include "testing/gmock/include/gmock/gmock.h"

17 #include "testing/gtest/include/gtest/gtest.h"	17 #include "testing/gtest/include/gtest/gtest.h"

18 #include "ui/compositor/compositor.h"	18 #include "ui/compositor/compositor.h"

19 #include "ui/compositor/layer.h"	19 #include "ui/compositor/layer.h"

20 #include "ui/compositor/test/context_factories_for_test.h"	20 #include "ui/compositor/test/context_factories_for_test.h"

21 #include "ui/compositor/test/draw_waiter_for_test.h"	21 #include "ui/compositor/test/draw_waiter_for_test.h"

22	22

23 using testing::Mock;	23 using testing::Mock;

(...skipping 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
153 EXPECT_EQ(gfx::kNullAcceleratedWidget,	153 EXPECT_EQ(gfx::kNullAcceleratedWidget,

154 compositor()->ReleaseAcceleratedWidget());	154 compositor()->ReleaseAcceleratedWidget());

155 compositor()->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);	155 compositor()->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);

156 compositor()->SetVisible(true);	156 compositor()->SetVisible(true);

157 compositor()->ScheduleDraw();	157 compositor()->ScheduleDraw();

158 DrawWaiterForTest::WaitForCompositingEnded(compositor());	158 DrawWaiterForTest::WaitForCompositingEnded(compositor());

159 compositor()->SetRootLayer(nullptr);	159 compositor()->SetRootLayer(nullptr);

160 }	160 }

161	161

162 } // namespace ui	162 } // namespace ui

OLD	NEW