Aura: Resize locks with --ui-enable-threaded-compositing

ui/aura/root_window.h

Index: ui/aura/root_window.h
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index ac435e8dc5b274a157deb31de7be7f517e809102..01351b4c95f5adb995e3b5336b8987499275c18b 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -48,31 +48,6 @@ class RootWindowObserver;
 class ScrollEvent;
 class TouchEvent;
 
-// This class represents a lock on the compositor, that can be used to prevent a
-// compositing pass from happening while we're waiting for an asynchronous
-// event. The typical use case is when waiting for a renderer to produce a frame
-// at the right size. The caller keeps a reference on this object, and drops the
-// reference once it desires to release the lock.
-// Note however that the lock is canceled after a short timeout to ensure
-// responsiveness of the UI, so the compositor tree should be kept in a
-// "reasonable" state while the lock is held.
-// Don't instantiate this class directly, use RootWindow::GetCompositorLock.
-class AURA_EXPORT CompositorLock
-    : public base::RefCounted<CompositorLock>,
-      public base::SupportsWeakPtr<CompositorLock> {
- private:
-  friend class base::RefCounted<CompositorLock>;
-  friend class RootWindow;
-
-  explicit CompositorLock(RootWindow* root_window);
-  ~CompositorLock();
-
-  void CancelLock();
-
-  RootWindow* root_window_;
-  DISALLOW_COPY_AND_ASSIGN(CompositorLock);
-};
-
 // RootWindow is responsible for hosting a set of windows.
 class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
                                public ui::CompositorObserver,
@@ -216,9 +191,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   void HoldMouseMoves();
   void ReleaseMouseMoves();
 
-  // Creates a compositor lock.
-  scoped_refptr<CompositorLock> GetCompositorLock();
-
   // Sets if the window should be focused when shown.
   void SetFocusWhenShown(bool focus_when_shown);
 
@@ -263,7 +235,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
 
  private:
   friend class Window;
-  friend class CompositorLock;
 
   // Called whenever the mouse moves, tracks the current |mouse_moved_handler_|,
   // sending exited and entered events as its value changes.
@@ -342,9 +313,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   // current mouse location.
   void SynthesizeMouseMoveEvent();
 
-  // Called by CompositorLock.
-  void UnlockCompositor();
-
   scoped_ptr<ui::Compositor> compositor_;
 
   scoped_ptr<RootWindowHost> host_;
@@ -395,9 +363,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   // to 0.
   base::WeakPtrFactory<RootWindow> held_mouse_event_factory_;
 
-  CompositorLock* compositor_lock_;
-  bool draw_on_compositor_unlock_;
-
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };