cc/surfaces/display.h - Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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.h

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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

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 #ifndef CC_SURFACES_DISPLAY_H_	5 #ifndef CC_SURFACES_DISPLAY_H_

6 #define CC_SURFACES_DISPLAY_H_	6 #define CC_SURFACES_DISPLAY_H_

7	7

8 #include <vector>

9

10 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

11 #include "cc/output/output_surface_client.h"	9 #include "cc/output/output_surface_client.h"

12 #include "cc/output/renderer.h"	10 #include "cc/output/renderer.h"

13 #include "cc/resources/returned_resource.h"	11 #include "cc/resources/returned_resource.h"

14 #include "cc/surfaces/surface_aggregator.h"	12 #include "cc/surfaces/surface_aggregator.h"

15 #include "cc/surfaces/surface_id.h"	13 #include "cc/surfaces/surface_id.h"

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

17 #include "cc/surfaces/surfaces_export.h"	15 #include "cc/surfaces/surfaces_export.h"

18	16

19 namespace gfx {	17 namespace gfx {

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 RendererSettings settings_;	94 RendererSettings settings_;

97 SurfaceId current_surface_id_;	95 SurfaceId current_surface_id_;

98 gfx::Size current_surface_size_;	96 gfx::Size current_surface_size_;

99 float device_scale_factor_;	97 float device_scale_factor_;

100 scoped_ptr<OutputSurface> output_surface_;	98 scoped_ptr<OutputSurface> output_surface_;

101 scoped_ptr<ResourceProvider> resource_provider_;	99 scoped_ptr<ResourceProvider> resource_provider_;

102 scoped_ptr<SurfaceAggregator> aggregator_;	100 scoped_ptr<SurfaceAggregator> aggregator_;

103 scoped_ptr<DirectRenderer> renderer_;	101 scoped_ptr<DirectRenderer> renderer_;

104 scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_;	102 scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_;

105 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_;	103 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_;

106 std::vector<ui::LatencyInfo> stored_latency_info_;

107	104

108 DISALLOW_COPY_AND_ASSIGN(Display);	105 DISALLOW_COPY_AND_ASSIGN(Display);

109 };	106 };

110	107

111 } // namespace cc	108 } // namespace cc

112	109

113 #endif // CC_SURFACES_DISPLAY_H_	110 #endif // CC_SURFACES_DISPLAY_H_

OLD	NEW

« no previous file with comments | « cc/scheduler/scheduler_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »