cc/surfaces/display.cc - Issue 885543002: Mechanical rename of tracing includes for /cc

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: cc/surfaces/display.cc

Issue 885543002: Mechanical rename of tracing includes for /cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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 | « cc/scheduler/scheduler_unittest.cc ('k') | cc/surfaces/surface_aggregator.cc » ('j') | no next file with comments »

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 "cc/surfaces/display.h"	5 #include "cc/surfaces/display.h"

6	6

7 #include "base/debug/trace_event.h"

8 #include "base/message_loop/message_loop.h"	7 #include "base/message_loop/message_loop.h"

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

9 #include "cc/debug/benchmark_instrumentation.h"	9 #include "cc/debug/benchmark_instrumentation.h"

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

11 #include "cc/output/compositor_frame_ack.h"	11 #include "cc/output/compositor_frame_ack.h"

12 #include "cc/output/direct_renderer.h"	12 #include "cc/output/direct_renderer.h"

13 #include "cc/output/gl_renderer.h"	13 #include "cc/output/gl_renderer.h"

14 #include "cc/output/renderer_settings.h"	14 #include "cc/output/renderer_settings.h"

15 #include "cc/output/software_renderer.h"	15 #include "cc/output/software_renderer.h"

16 #include "cc/resources/texture_mailbox_deleter.h"	16 #include "cc/resources/texture_mailbox_deleter.h"

17 #include "cc/surfaces/display_client.h"	17 #include "cc/surfaces/display_client.h"

18 #include "cc/surfaces/surface.h"	18 #include "cc/surfaces/surface.h"

(...skipping 178 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
197 return current_surface_id_;	197 return current_surface_id_;

198 }	198 }

199	199

200 int Display::GetMaxFramesPending() {	200 int Display::GetMaxFramesPending() {

201 if (!output_surface_)	201 if (!output_surface_)

202 return OutputSurface::DEFAULT_MAX_FRAMES_PENDING;	202 return OutputSurface::DEFAULT_MAX_FRAMES_PENDING;

203 return output_surface_->capabilities().max_frames_pending;	203 return output_surface_->capabilities().max_frames_pending;

204 }	204 }

205	205

206 } // namespace cc	206 } // namespace cc

OLD	NEW