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

Side by Side Diff: webkit/common/gpu/test_context_provider_factory.cc

Issue 16046003: Move webkit/gpu into webkit/common/gpu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in content/common/gpu/client/gl_helper_* Created 7 years, 7 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
OLDNEW
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/common/gpu/test_context_provider_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "cc/output/context_provider.h" 8 #include "cc/output/context_provider.h"
9 #include "webkit/gpu/context_provider_in_process.h" 9 #include "webkit/common/gpu/context_provider_in_process.h"
10 10
11 namespace webkit { 11 namespace webkit {
12 namespace gpu { 12 namespace gpu {
13 13
14 static TestContextProviderFactory* context_provider_instance = NULL; 14 static TestContextProviderFactory* context_provider_instance = NULL;
15 15
16 // static 16 // static
17 TestContextProviderFactory* TestContextProviderFactory::GetInstance() { 17 TestContextProviderFactory* TestContextProviderFactory::GetInstance() {
18 if (!context_provider_instance) 18 if (!context_provider_instance)
19 context_provider_instance = new TestContextProviderFactory(); 19 context_provider_instance = new TestContextProviderFactory();
(...skipping 17 matching lines...) Expand all
37 scoped_refptr<cc::ContextProvider> TestContextProviderFactory:: 37 scoped_refptr<cc::ContextProvider> TestContextProviderFactory::
38 OffscreenContextProviderForCompositorThread() { 38 OffscreenContextProviderForCompositorThread() {
39 if (!compositor_thread_ || 39 if (!compositor_thread_ ||
40 compositor_thread_->DestroyedOnMainThread()) 40 compositor_thread_->DestroyedOnMainThread())
41 compositor_thread_ = ContextProviderInProcess::Create(); 41 compositor_thread_ = ContextProviderInProcess::Create();
42 return compositor_thread_; 42 return compositor_thread_;
43 } 43 }
44 44
45 } // namespace gpu 45 } // namespace gpu
46 } // namespace webkit 46 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698