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

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

Issue 271843002: Remove SharedBitmapManager global in ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mojo Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/test/in_process_context_factory.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 959d984e3deb7f74e952ced398dcd9a6195e1ec1..7aa8098ae6eb2ab34c7b665c38076025bb9b5125 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -5,6 +5,7 @@
#include "ui/compositor/test/in_process_context_factory.h"
#include "cc/output/output_surface.h"
+#include "cc/test/test_shared_bitmap_manager.h"
#include "ui/compositor/reflector.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_surface.h"
@@ -14,7 +15,8 @@
namespace ui {
-InProcessContextFactory::InProcessContextFactory() {
+InProcessContextFactory::InProcessContextFactory()
+ : shared_bitmap_manager_(new cc::TestSharedBitmapManager()) {
DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone);
}
@@ -74,4 +76,8 @@ void InProcessContextFactory::RemoveCompositor(Compositor* compositor) {}
bool InProcessContextFactory::DoesCreateTestContexts() { return false; }
+cc::SharedBitmapManager* InProcessContextFactory::GetSharedBitmapManager() {
+ return shared_bitmap_manager_.get();
+}
+
} // namespace ui
« no previous file with comments | « ui/compositor/test/in_process_context_factory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698