| Index: ui/compositor/compositor.h
|
| diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
|
| index a734f3e9c33cb2eeea97541b75538e7c07b60df9..c02e0d571cbbf72d134aaee151186084d7a877fa 100644
|
| --- a/ui/compositor/compositor.h
|
| +++ b/ui/compositor/compositor.h
|
| @@ -68,8 +68,7 @@ class COMPOSITOR_EXPORT ContextFactory {
|
| // Creates an output surface for the given compositor. The factory may keep
|
| // per-compositor data (e.g. a shared context), that needs to be cleaned up
|
| // by calling RemoveCompositor when the compositor gets destroyed.
|
| - virtual void CreateOutputSurface(base::WeakPtr<Compositor> compositor,
|
| - bool software_fallback) = 0;
|
| + virtual void CreateOutputSurface(base::WeakPtr<Compositor> compositor) = 0;
|
|
|
| // Creates a reflector that copies the content of the |mirrored_compositor|
|
| // onto |mirroring_layer|.
|
| @@ -286,11 +285,6 @@ class COMPOSITOR_EXPORT Compositor
|
| friend class base::RefCounted<Compositor>;
|
| friend class CompositorLock;
|
|
|
| - enum {
|
| - OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK = 4,
|
| - MAX_OUTPUT_SURFACE_RETRIES = 5,
|
| - };
|
| -
|
| // Called by CompositorLock.
|
| void UnlockCompositor();
|
|
|
| @@ -323,8 +317,6 @@ class COMPOSITOR_EXPORT Compositor
|
| int last_started_frame_;
|
| int last_ended_frame_;
|
|
|
| - int num_failed_recreate_attempts_;
|
| -
|
| bool disable_schedule_composite_;
|
|
|
| CompositorLock* compositor_lock_;
|
|
|