Aura: Make views_unittests work with --ui-enable-threaded-compositing

ui/compositor/compositor.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
 #define UI_COMPOSITOR_COMPOSITOR_H_
 
 #include <string>
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/compositor_export.h"
+#include "ui/compositor/compositor_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/gl/gl_share_group.h"
 
 class SkBitmap;
 
+namespace base {
+class RunLoop;
+}
+
 namespace cc {
 class ContextProvider;
 class Layer;
 class LayerTreeHost;
 }
 
 namespace gfx {
 class GLContext;
 class GLSurface;
 class GLShareGroup;
@@ skipping 164 matching lines @@
 
   explicit CompositorLock(Compositor* compositor);
   ~CompositorLock();
 
   void CancelLock();
 
   Compositor* compositor_;
   DISALLOW_COPY_AND_ASSIGN(CompositorLock);
 };
 
+class COMPOSITOR_EXPORT DrawWaiterForTest : public ui::CompositorObserver {
+ public:
+  // Waits at most |kDrawWaitTimeOutMs| milliseconds for a draw to be issued.
+  // If a draw is issued in that timeframe, it will complete. Returns true if
+  // a draw completed, false otherwise.
+  static bool Wait(Compositor* compositor);
+
+ private:
+  DrawWaiterForTest();
+  virtual ~DrawWaiterForTest();
+
+  bool WaitImpl(Compositor* compositor);
+  void TimedOutWhileWaiting();
+
+  // CompositorObserver implementation.
+  virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE;
+  virtual void OnCompositingStarted(Compositor* compositor,
+                                    base::TimeTicks start_time) OVERRIDE;
+  virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE;
+  virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE;
+  virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE;
+  virtual void OnUpdateVSyncParameters(Compositor* compositor,
+                                       base::TimeTicks timebase,
+                                       base::TimeDelta interval) OVERRIDE;
+
+  const int kDrawWaitTimeOutMs;
+
+  scoped_ptr<base::RunLoop> wait_run_loop_;
+  bool did_draw_;
+
+  DISALLOW_COPY_AND_ASSIGN(DrawWaiterForTest);
+};
 
 // Compositor object to take care of GPU painting.
 // A Browser compositor object is responsible for generating the final
 // displayable form of pixels comprising a single widget's contents. It draws an
 // appropriately transformed texture for each transformed view in the widget's
 // view hierarchy.
 class COMPOSITOR_EXPORT Compositor
     : NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
       public base::SupportsWeakPtr<Compositor> {
  public:
@@ skipping 145 matching lines @@
   bool disable_schedule_composite_;
 
   CompositorLock* compositor_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(Compositor);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_COMPOSITOR_H_