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

Side by Side Diff: cc/surfaces/display.h

Issue 485043003: cc: Use correct message loop proxy in BlockingTaskRunner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits. Created 6 years, 3 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 | « cc/resources/video_resource_updater_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/output/output_surface_client.h" 9 #include "cc/output/output_surface_client.h"
10 #include "cc/output/renderer.h" 10 #include "cc/output/renderer.h"
11 #include "cc/resources/returned_resource.h" 11 #include "cc/resources/returned_resource.h"
12 #include "cc/surfaces/surface_aggregator.h" 12 #include "cc/surfaces/surface_aggregator.h"
13 #include "cc/surfaces/surface_id.h" 13 #include "cc/surfaces/surface_id.h"
14 #include "cc/surfaces/surface_manager.h" 14 #include "cc/surfaces/surface_manager.h"
15 #include "cc/surfaces/surfaces_export.h" 15 #include "cc/surfaces/surfaces_export.h"
16 16
17 namespace gfx { 17 namespace gfx {
18 class Size; 18 class Size;
19 } 19 }
20 20
21 namespace cc { 21 namespace cc {
22 22
23 class BlockingTaskRunner;
23 class DirectRenderer; 24 class DirectRenderer;
24 class DisplayClient; 25 class DisplayClient;
25 class OutputSurface; 26 class OutputSurface;
26 class ResourceProvider; 27 class ResourceProvider;
27 class SharedBitmapManager; 28 class SharedBitmapManager;
28 class Surface; 29 class Surface;
29 class SurfaceAggregator; 30 class SurfaceAggregator;
30 class SurfaceIdAllocator; 31 class SurfaceIdAllocator;
31 class SurfaceFactory; 32 class SurfaceFactory;
32 33
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 DisplayClient* client_; 82 DisplayClient* client_;
82 SurfaceManager* manager_; 83 SurfaceManager* manager_;
83 SharedBitmapManager* bitmap_manager_; 84 SharedBitmapManager* bitmap_manager_;
84 SurfaceId current_surface_id_; 85 SurfaceId current_surface_id_;
85 gfx::Size current_surface_size_; 86 gfx::Size current_surface_size_;
86 LayerTreeSettings settings_; 87 LayerTreeSettings settings_;
87 scoped_ptr<OutputSurface> output_surface_; 88 scoped_ptr<OutputSurface> output_surface_;
88 scoped_ptr<ResourceProvider> resource_provider_; 89 scoped_ptr<ResourceProvider> resource_provider_;
89 scoped_ptr<SurfaceAggregator> aggregator_; 90 scoped_ptr<SurfaceAggregator> aggregator_;
90 scoped_ptr<DirectRenderer> renderer_; 91 scoped_ptr<DirectRenderer> renderer_;
92 scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_;
91 93
92 DISALLOW_COPY_AND_ASSIGN(Display); 94 DISALLOW_COPY_AND_ASSIGN(Display);
93 }; 95 };
94 96
95 } // namespace cc 97 } // namespace cc
96 98
97 #endif // CC_SURFACES_DISPLAY_H_ 99 #endif // CC_SURFACES_DISPLAY_H_
OLDNEW
« no previous file with comments | « cc/resources/video_resource_updater_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698