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/gtest_prod_util.h"
 #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/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
@@ skipping 14 matching lines @@
 class GLSurface;
 class GLShareGroup;
 class Point;
 class Rect;
 }
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
+namespace views {
+FORWARD_DECLARE_TEST(ViewLayerTest, DontPaintChildrenWithLayers);
+}
+
 namespace ui {
 
 class Compositor;
 class CompositorObserver;
 class ContextProviderFromContextFactory;
 class Layer;
 class PostedSwapQueue;
 
 // This class abstracts the creation of the 3D context for the compositor. It is
 // a global object.
@@ skipping 265 matching lines @@
       OffscreenContextProviderForMainThread() OVERRIDE;
   virtual scoped_refptr<cc::ContextProvider>
       OffscreenContextProviderForCompositorThread() OVERRIDE;
 
   int last_started_frame() { return last_started_frame_; }
   int last_ended_frame() { return last_ended_frame_; }
 
   bool IsLocked() { return compositor_lock_ != NULL; }
 
  private:
+  const int kDrawWaitTimeOutMs = 1000;
+  friend class DrawWaiter;

[piman, 2013/04/05 19:28:49]

I don't think DrawWaiter needs intimate knowledge of the compositor.

How about moving DrawWaiter to be more public, and moving the timeout value
there, and then providing maybe a helper static
DrawWaiter::Wait(ui::Compositor*) ?

That way, we don't need the layering violating friend declaration.

If we're worried about misuse outside of tests, we can name it DrawWaiterForTest
(and/or moving it to test infrastructure).

[jonathan.backer, 2013/04/05 20:08:04]

Done.

I think it's much cleaner now. Thanks.

+
+  // 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.
+  bool WaitForDraw();
+  friend class LayerWithDelegateTest;
+  friend class LayerWithRealCompositorTest;
+  FRIEND_TEST_ALL_PREFIXES(views::ViewLayerTest, DontPaintChildrenWithLayers);
+
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;
 
   // Called by CompositorLock.
   void UnlockCompositor();
 
   // Called to release any pending CompositorLock
   void CancelCompositorLock();
 
   // Notifies the compositor that compositing is complete.
@@ skipping 24 matching lines @@
   bool disable_schedule_composite_;
 
   CompositorLock* compositor_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(Compositor);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_COMPOSITOR_H_