summaryrefslogtreecommitdiffstats
path: root/webkit/common
diff options
context:
space:
mode:
authorpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 00:16:41 +0000
committerpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 00:16:41 +0000
commitc818cac834ecc729fb67090bc92f1d467a87087d (patch)
treee6daa787a9a3ae790071d69fda56764ac2249ca3 /webkit/common
parent8c2962b98eef74c601807c94158498abdf21e3f3 (diff)
downloadchromium_src-c818cac834ecc729fb67090bc92f1d467a87087d.zip
chromium_src-c818cac834ecc729fb67090bc92f1d467a87087d.tar.gz
chromium_src-c818cac834ecc729fb67090bc92f1d467a87087d.tar.bz2
Move webkit/common/gpu/test_context_provider_factory.* to content/test/
BUG=338338 Review URL: https://codereview.chromium.org/160013003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
-rw-r--r--webkit/common/gpu/test_context_provider_factory.cc38
-rw-r--r--webkit/common/gpu/test_context_provider_factory.h38
-rw-r--r--webkit/common/gpu/webkit_gpu.gyp2
3 files changed, 0 insertions, 78 deletions
diff --git a/webkit/common/gpu/test_context_provider_factory.cc b/webkit/common/gpu/test_context_provider_factory.cc
deleted file mode 100644
index 7e4f04f..0000000
--- a/webkit/common/gpu/test_context_provider_factory.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/common/gpu/test_context_provider_factory.h"
-
-#include "base/logging.h"
-#include "cc/output/context_provider.h"
-#include "webkit/common/gpu/context_provider_in_process.h"
-
-namespace webkit {
-namespace gpu {
-
-static TestContextProviderFactory* context_provider_instance = NULL;
-
-// static
-TestContextProviderFactory* TestContextProviderFactory::GetInstance() {
- if (!context_provider_instance)
- context_provider_instance = new TestContextProviderFactory();
- return context_provider_instance;
-}
-
-TestContextProviderFactory::TestContextProviderFactory() {}
-
-TestContextProviderFactory::~TestContextProviderFactory() {}
-
-scoped_refptr<cc::ContextProvider> TestContextProviderFactory::
- OffscreenContextProviderForMainThread() {
- if (!main_thread_.get() || main_thread_->DestroyedOnMainThread()) {
- main_thread_ = ContextProviderInProcess::CreateOffscreen();
- if (main_thread_.get() && !main_thread_->BindToCurrentThread())
- main_thread_ = NULL;
- }
- return main_thread_;
-}
-
-} // namespace gpu
-} // namespace webkit
diff --git a/webkit/common/gpu/test_context_provider_factory.h b/webkit/common/gpu/test_context_provider_factory.h
deleted file mode 100644
index 52bec77..0000000
--- a/webkit/common/gpu/test_context_provider_factory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_COMMON_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_
-#define WEBKIT_COMMON_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_
-
-#include "base/memory/ref_counted.h"
-#include "webkit/common/gpu/webkit_gpu_export.h"
-
-namespace cc {
-class ContextProvider;
-}
-
-namespace webkit {
-namespace gpu {
-class ContextProviderInProcess;
-
-class WEBKIT_GPU_EXPORT TestContextProviderFactory {
- public:
- // The returned pointer is static and should not be deleted by the caller.
- static TestContextProviderFactory* GetInstance();
-
- scoped_refptr<cc::ContextProvider> OffscreenContextProviderForMainThread();
-
- private:
- TestContextProviderFactory();
- ~TestContextProviderFactory();
-
- scoped_refptr<webkit::gpu::ContextProviderInProcess> main_thread_;
-
- DISALLOW_COPY_AND_ASSIGN(TestContextProviderFactory);
-};
-
-} // namespace gpu
-} // namespace webkit
-
-#endif // WEBKIT_COMMON_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp
index bc2081c..1ccd5dc 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/webkit/common/gpu/webkit_gpu.gyp
@@ -36,8 +36,6 @@
'context_provider_web_context.h',
'grcontext_for_webgraphicscontext3d.cc',
'grcontext_for_webgraphicscontext3d.h',
- 'test_context_provider_factory.cc',
- 'test_context_provider_factory.h',
'webgraphicscontext3d_in_process_command_buffer_impl.cc',
'webgraphicscontext3d_in_process_command_buffer_impl.h',
],