OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "webkit/gpu/test_context_provider_factory.h" | 5 #include "webkit/gpu/test_context_provider_factory.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "cc/context_provider.h" | 8 #include "cc/output/context_provider.h" |
9 #include "webkit/gpu/context_provider_in_process.h" | 9 #include "webkit/gpu/context_provider_in_process.h" |
10 | 10 |
11 namespace webkit { | 11 namespace webkit { |
12 namespace gpu { | 12 namespace gpu { |
13 | 13 |
14 #ifndef NDEBUG | 14 #ifndef NDEBUG |
15 static bool factory_set_up = false; | 15 static bool factory_set_up = false; |
16 #endif | 16 #endif |
17 static ContextProviderInProcess::InProcessType context_provider_type; | 17 static ContextProviderInProcess::InProcessType context_provider_type; |
18 static TestContextProviderFactory* context_provider_instance = NULL; | 18 static TestContextProviderFactory* context_provider_instance = NULL; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 if (!compositor_thread_ || | 66 if (!compositor_thread_ || |
67 compositor_thread_->DestroyedOnMainThread()) { | 67 compositor_thread_->DestroyedOnMainThread()) { |
68 compositor_thread_ = ContextProviderInProcess::Create( | 68 compositor_thread_ = ContextProviderInProcess::Create( |
69 context_provider_type); | 69 context_provider_type); |
70 } | 70 } |
71 return compositor_thread_; | 71 return compositor_thread_; |
72 } | 72 } |
73 | 73 |
74 } // namespace gpu | 74 } // namespace gpu |
75 } // namespace webkit | 75 } // namespace webkit |
OLD | NEW |