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

Unified Diff: ui/compositor/test/test_context_factory.cc

Issue 145293007: ui: No more TestCompositor. Use NullDraw contexts in unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testsnulldraw: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/test/test_context_factory.h ('k') | ui/gl/gl_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_context_factory.cc
diff --git a/ui/compositor/test/test_context_factory.cc b/ui/compositor/test/test_context_factory.cc
deleted file mode 100644
index 0c4b274f53b4e604e2877282068e2b0ea42f0870..0000000000000000000000000000000000000000
--- a/ui/compositor/test/test_context_factory.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 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 "ui/compositor/test/test_context_factory.h"
-
-#include "cc/output/output_surface.h"
-#include "cc/test/test_context_provider.h"
-#include "ui/compositor/reflector.h"
-
-namespace ui {
-
-TestContextFactory::TestContextFactory() {}
-
-TestContextFactory::~TestContextFactory() {}
-
-scoped_ptr<cc::OutputSurface> TestContextFactory::CreateOutputSurface(
- Compositor* compositor, bool software_fallback) {
- DCHECK(!software_fallback);
- return make_scoped_ptr(
- new cc::OutputSurface(cc::TestContextProvider::Create()));
-}
-
-scoped_refptr<Reflector> TestContextFactory::CreateReflector(
- Compositor* mirrored_compositor,
- Layer* mirroring_layer) {
- return new Reflector();
-}
-
-void TestContextFactory::RemoveReflector(scoped_refptr<Reflector> reflector) {
-}
-
-scoped_refptr<cc::ContextProvider>
-TestContextFactory::OffscreenCompositorContextProvider() {
- if (!offscreen_compositor_contexts_.get() ||
- offscreen_compositor_contexts_->DestroyedOnMainThread())
- offscreen_compositor_contexts_ = cc::TestContextProvider::Create();
- return offscreen_compositor_contexts_;
-}
-
-scoped_refptr<cc::ContextProvider>
-TestContextFactory::SharedMainThreadContextProvider() {
- if (shared_main_thread_contexts_ &&
- !shared_main_thread_contexts_->DestroyedOnMainThread())
- return shared_main_thread_contexts_;
-
- if (ui::Compositor::WasInitializedWithThread()) {
- shared_main_thread_contexts_ = cc::TestContextProvider::Create();
- } else {
- shared_main_thread_contexts_ =
- static_cast<cc::TestContextProvider*>(
- OffscreenCompositorContextProvider().get());
- }
- if (shared_main_thread_contexts_ &&
- !shared_main_thread_contexts_->BindToCurrentThread())
- shared_main_thread_contexts_ = NULL;
-
- return shared_main_thread_contexts_;
-}
-
-void TestContextFactory::RemoveCompositor(Compositor* compositor) {
-}
-
-bool TestContextFactory::DoesCreateTestContexts() { return true; }
-
-} // namespace ui
« no previous file with comments | « ui/compositor/test/test_context_factory.h ('k') | ui/gl/gl_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698