| Index: mojo/services/view_manager/context_factory_impl.cc
|
| diff --git a/mojo/aura/context_factory_mojo.cc b/mojo/services/view_manager/context_factory_impl.cc
|
| similarity index 69%
|
| rename from mojo/aura/context_factory_mojo.cc
|
| rename to mojo/services/view_manager/context_factory_impl.cc
|
| index a95cc2516506acf326dc5cc8d6a8edf4d39acb4d..c3977e7d2e4b3dbb1bb41b7571d1248dd1160ae1 100644
|
| --- a/mojo/aura/context_factory_mojo.cc
|
| +++ b/mojo/services/view_manager/context_factory_impl.cc
|
| @@ -2,10 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/aura/context_factory_mojo.h"
|
| +#include "mojo/services/view_manager/context_factory_impl.h"
|
|
|
| #include "cc/output/output_surface.h"
|
| -#include "mojo/aura/window_tree_host_mojo.h"
|
| #include "mojo/cc/context_provider_mojo.h"
|
| #include "ui/compositor/reflector.h"
|
| #include "ui/gl/gl_implementation.h"
|
| @@ -15,34 +14,36 @@
|
| #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
|
|
|
| namespace mojo {
|
| +namespace view_manager {
|
| +namespace service {
|
|
|
| -ContextFactoryMojo::ContextFactoryMojo(
|
| +ContextFactoryImpl::ContextFactoryImpl(
|
| ScopedMessagePipeHandle command_buffer_handle)
|
| : command_buffer_handle_(command_buffer_handle.Pass()) {
|
| }
|
|
|
| -ContextFactoryMojo::~ContextFactoryMojo() {
|
| +ContextFactoryImpl::~ContextFactoryImpl() {
|
| }
|
|
|
| -scoped_ptr<cc::OutputSurface> ContextFactoryMojo::CreateOutputSurface(
|
| +scoped_ptr<cc::OutputSurface> ContextFactoryImpl::CreateOutputSurface(
|
| ui::Compositor* compositor, bool software_fallback) {
|
| return make_scoped_ptr(
|
| new cc::OutputSurface(
|
| new ContextProviderMojo(command_buffer_handle_.Pass())));
|
| }
|
|
|
| -scoped_refptr<ui::Reflector> ContextFactoryMojo::CreateReflector(
|
| +scoped_refptr<ui::Reflector> ContextFactoryImpl::CreateReflector(
|
| ui::Compositor* mirroed_compositor,
|
| ui::Layer* mirroring_layer) {
|
| return NULL;
|
| }
|
|
|
| -void ContextFactoryMojo::RemoveReflector(
|
| +void ContextFactoryImpl::RemoveReflector(
|
| scoped_refptr<ui::Reflector> reflector) {
|
| }
|
|
|
| scoped_refptr<cc::ContextProvider>
|
| -ContextFactoryMojo::SharedMainThreadContextProvider() {
|
| +ContextFactoryImpl::SharedMainThreadContextProvider() {
|
| if (!shared_main_thread_contexts_ ||
|
| shared_main_thread_contexts_->DestroyedOnMainThread()) {
|
| bool lose_context_when_out_of_memory = false;
|
| @@ -56,17 +57,19 @@ ContextFactoryMojo::SharedMainThreadContextProvider() {
|
| return shared_main_thread_contexts_;
|
| }
|
|
|
| -void ContextFactoryMojo::RemoveCompositor(ui::Compositor* compositor) {
|
| +void ContextFactoryImpl::RemoveCompositor(ui::Compositor* compositor) {
|
| }
|
|
|
| -bool ContextFactoryMojo::DoesCreateTestContexts() { return false; }
|
| +bool ContextFactoryImpl::DoesCreateTestContexts() { return false; }
|
|
|
| -cc::SharedBitmapManager* ContextFactoryMojo::GetSharedBitmapManager() {
|
| +cc::SharedBitmapManager* ContextFactoryImpl::GetSharedBitmapManager() {
|
| return NULL;
|
| }
|
|
|
| -base::MessageLoopProxy* ContextFactoryMojo::GetCompositorMessageLoop() {
|
| +base::MessageLoopProxy* ContextFactoryImpl::GetCompositorMessageLoop() {
|
| return NULL;
|
| }
|
|
|
| +} // namespace service
|
| +} // namespace view_manager
|
| } // namespace mojo
|
|
|