| OLD | NEW |
| 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 "cc/output/context_provider.h" | 8 #include "cc/output/context_provider.h" |
| 9 #include "skia/ext/refptr.h" | 9 #include "skia/ext/refptr.h" |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 const LostContextCallback& lost_context_callback) OVERRIDE; | 34 const LostContextCallback& lost_context_callback) OVERRIDE; |
| 35 virtual void SetMemoryPolicyChangedCallback( | 35 virtual void SetMemoryPolicyChangedCallback( |
| 36 const MemoryPolicyChangedCallback& memory_policy_changed_callback) | 36 const MemoryPolicyChangedCallback& memory_policy_changed_callback) |
| 37 OVERRIDE; | 37 OVERRIDE; |
| 38 | 38 |
| 39 protected: | 39 protected: |
| 40 friend class base::RefCountedThreadSafe<TestInProcessContextProvider>; | 40 friend class base::RefCountedThreadSafe<TestInProcessContextProvider>; |
| 41 virtual ~TestInProcessContextProvider(); | 41 virtual ~TestInProcessContextProvider(); |
| 42 | 42 |
| 43 private: | 43 private: |
| 44 scoped_ptr<gpu::GLInProcessContext> context_; |
| 44 skia::RefPtr<class GrContext> gr_context_; | 45 skia::RefPtr<class GrContext> gr_context_; |
| 45 scoped_ptr<gpu::GLInProcessContext> context_; | |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 } // namespace cc | 48 } // namespace cc |
| 49 | 49 |
| 50 #endif // CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ | 50 #endif // CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ |
| OLD | NEW |