cc/surfaces/display.h - Issue 327103002: Fix header guard in cc/surfaces/display

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 327103002: Fix header guard in cc/surfaces/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | cc/surfaces/display.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 #ifndef CC_SURFACES_DISPLAY_H_

	6 #define CC_SURFACES_DISPLAY_H_

	7

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

6	9

7 #include "cc/layers/delegated_frame_resource_collection.h"	10 #include "cc/layers/delegated_frame_resource_collection.h"

8 #include "cc/layers/delegated_renderer_layer.h"	11 #include "cc/layers/delegated_renderer_layer.h"

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

10 #include "cc/surfaces/surface_aggregator.h"	13 #include "cc/surfaces/surface_aggregator.h"

11 #include "cc/surfaces/surface_client.h"	14 #include "cc/surfaces/surface_client.h"

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

13 #include "cc/trees/layer_tree_host_client.h"	16 #include "cc/trees/layer_tree_host_client.h"

14 #include "cc/trees/layer_tree_host_single_thread_client.h"	17 #include "cc/trees/layer_tree_host_single_thread_client.h"

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 scoped_ptr<LayerTreeHost> layer_tree_host_;	86 scoped_ptr<LayerTreeHost> layer_tree_host_;

84 scoped_refptr<DelegatedFrameResourceCollection> resource_collection_;	87 scoped_refptr<DelegatedFrameResourceCollection> resource_collection_;

85 scoped_refptr<DelegatedFrameProvider> delegated_frame_provider_;	88 scoped_refptr<DelegatedFrameProvider> delegated_frame_provider_;

86 scoped_refptr<DelegatedRendererLayer> delegated_layer_;	89 scoped_refptr<DelegatedRendererLayer> delegated_layer_;

87 base::WeakPtrFactory<Display> schedule_draw_factory_;	90 base::WeakPtrFactory<Display> schedule_draw_factory_;

88	91

89 DISALLOW_COPY_AND_ASSIGN(Display);	92 DISALLOW_COPY_AND_ASSIGN(Display);

90 };	93 };

91	94

92 } // namespace cc	95 } // namespace cc

	96

	97 #endif // CC_SURFACES_DISPLAY_H_

OLD	NEW