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

Side by Side Diff: cc/test/test_in_process_context_provider.h

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ 5 #ifndef CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
6 #define CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ 6 #define CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/single_thread_task_runner.h"
12 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
13 #include "cc/output/context_provider.h" 14 #include "cc/output/context_provider.h"
14 #include "cc/test/test_gpu_memory_buffer_manager.h" 15 #include "cc/test/test_gpu_memory_buffer_manager.h"
15 #include "cc/test/test_image_factory.h" 16 #include "cc/test/test_image_factory.h"
16 17
17 class GrContext; 18 class GrContext;
18 19
19 namespace gpu { 20 namespace gpu {
20 class GLInProcessContext; 21 class GLInProcessContext;
21 } 22 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 TestImageFactory image_factory_; 59 TestImageFactory image_factory_;
59 std::unique_ptr<gpu::GLInProcessContext> context_; 60 std::unique_ptr<gpu::GLInProcessContext> context_;
60 std::unique_ptr<skia_bindings::GrContextForGLES2Interface> gr_context_; 61 std::unique_ptr<skia_bindings::GrContextForGLES2Interface> gr_context_;
61 std::unique_ptr<ContextCacheController> cache_controller_; 62 std::unique_ptr<ContextCacheController> cache_controller_;
62 base::Lock context_lock_; 63 base::Lock context_lock_;
63 }; 64 };
64 65
65 } // namespace cc 66 } // namespace cc
66 67
67 #endif // CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ 68 #endif // CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
OLDNEW
« no previous file with comments | « cc/resources/video_resource_updater_unittest.cc ('k') | cc/tiles/picture_layer_tiling_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698