| Index: ui/compositor/test/in_process_context_factory.h
|
| diff --git a/ui/compositor/test/default_context_factory.h b/ui/compositor/test/in_process_context_factory.h
|
| similarity index 63%
|
| rename from ui/compositor/test/default_context_factory.h
|
| rename to ui/compositor/test/in_process_context_factory.h
|
| index f377f2fe78a7e19513e0623a984c23d6cb644b35..14a843a719b1d667f103ee1fbac21e7d4b7a7333 100644
|
| --- a/ui/compositor/test/default_context_factory.h
|
| +++ b/ui/compositor/test/in_process_context_factory.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_
|
| -#define UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_
|
| +#ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
|
| +#define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
|
|
|
| #include "ui/compositor/compositor.h"
|
|
|
| @@ -15,25 +15,25 @@ class ContextProviderInProcess;
|
|
|
| namespace ui {
|
|
|
| -// The default factory that creates in-process contexts.
|
| -class DefaultContextFactory : public ContextFactory {
|
| +class InProcessContextFactory : public ContextFactory {
|
| public:
|
| - DefaultContextFactory();
|
| - virtual ~DefaultContextFactory();
|
| + InProcessContextFactory();
|
| + virtual ~InProcessContextFactory();
|
|
|
| // ContextFactory implementation
|
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
|
| - Compositor* compositor, bool software_fallback) OVERRIDE;
|
| + Compositor* compositor,
|
| + bool software_fallback) OVERRIDE;
|
|
|
| virtual scoped_refptr<Reflector> CreateReflector(
|
| - Compositor* compositor,
|
| - Layer* layer) OVERRIDE;
|
| + Compositor* mirrored_compositor,
|
| + Layer* mirroring_layer) OVERRIDE;
|
| virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE;
|
|
|
| virtual scoped_refptr<cc::ContextProvider>
|
| OffscreenCompositorContextProvider() OVERRIDE;
|
| - virtual scoped_refptr<cc::ContextProvider>
|
| - SharedMainThreadContextProvider() OVERRIDE;
|
| + virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider()
|
| + OVERRIDE;
|
| virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
|
| virtual bool DoesCreateTestContexts() OVERRIDE;
|
|
|
| @@ -43,9 +43,9 @@ class DefaultContextFactory : public ContextFactory {
|
| scoped_refptr<webkit::gpu::ContextProviderInProcess>
|
| shared_main_thread_contexts_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_
|
| +#endif // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
|
|
|