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

Side by Side Diff: cc/output/output_surface.h

Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)
Patch Set: Rebase again + presubmit fix Created 4 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_OUTPUT_OUTPUT_SURFACE_H_ 5 #ifndef CC_OUTPUT_OUTPUT_SURFACE_H_
6 #define CC_OUTPUT_OUTPUT_SURFACE_H_ 6 #define CC_OUTPUT_OUTPUT_SURFACE_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
15 #include "base/trace_event/memory_dump_provider.h"
15 #include "cc/base/cc_export.h" 16 #include "cc/base/cc_export.h"
16 #include "cc/output/context_provider.h" 17 #include "cc/output/context_provider.h"
17 #include "cc/output/overlay_candidate_validator.h" 18 #include "cc/output/overlay_candidate_validator.h"
18 #include "cc/output/software_output_device.h" 19 #include "cc/output/software_output_device.h"
19 #include "cc/output/vulkan_context_provider.h" 20 #include "cc/output/vulkan_context_provider.h"
20 #include "cc/resources/returned_resource.h" 21 #include "cc/resources/returned_resource.h"
21 #include "gpu/command_buffer/common/texture_in_use_response.h" 22 #include "gpu/command_buffer/common/texture_in_use_response.h"
22 #include "ui/gfx/color_space.h" 23 #include "ui/gfx/color_space.h"
23 24
24 namespace ui { 25 namespace ui {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 bool external_stencil_test_enabled_ = false; 209 bool external_stencil_test_enabled_ = false;
209 210
210 base::WeakPtrFactory<OutputSurface> weak_ptr_factory_; 211 base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
211 212
212 DISALLOW_COPY_AND_ASSIGN(OutputSurface); 213 DISALLOW_COPY_AND_ASSIGN(OutputSurface);
213 }; 214 };
214 215
215 } // namespace cc 216 } // namespace cc
216 217
217 #endif // CC_OUTPUT_OUTPUT_SURFACE_H_ 218 #endif // CC_OUTPUT_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « blimp/client/core/compositor/delegated_output_surface_unittest.cc ('k') | cc/output/output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698