Tracing for NSMenu timelines

ui/views/cocoa/bridged_native_widget.h

 // Copyright 2014 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_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
 #define UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
 
 #import <Cocoa/Cocoa.h>
 
+#include <functional>
 #include <memory>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #import "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/compositor/layer_owner.h"
 #import "ui/views/cocoa/bridged_native_widget_owner.h"
 #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h"
@@ skipping 157 matching lines @@
 
   // Creates a ui::Compositor which becomes responsible for drawing the window.
   void CreateLayer(ui::LayerType layer_type, bool translucent);
 
   // Updates |associated_views_| on NativeViewHost::Attach()/Detach().
   void SetAssociationForView(const views::View* view, NSView* native_view);
   void ClearAssociationForView(const views::View* view);
   // Sorts child NSViews according to NativeViewHosts order in views hierarchy.
   void ReorderChildViews();
 
+  // Schedules a draw then blocks the UI thread until the UI Compositor swaps in
+  // a new frame or a timeout occurs.
+  void PumpCompositor();
+
   NativeWidgetMac* native_widget_mac() { return native_widget_mac_; }
   BridgedContentView* ns_view() { return bridged_view_; }
   NSWindow* ns_window() { return window_; }
 
   TooltipManager* tooltip_manager() { return tooltip_manager_.get(); }
 
   DragDropClientMac* drag_drop_client() { return drag_drop_client_.get(); }
 
   // The parent widget specified in Widget::InitParams::parent. If non-null, the
   // parent will close children before the parent closes, and children will be
@@ skipping 31 matching lines @@
 
   // Installs the NSView for hosting the composited layer. It is later provided
   // to |compositor_widget_| via AcceleratedWidgetGetNSView().
   void AddCompositorSuperview();
 
   // Size the layer to match the client area bounds, taking into account display
   // scale factor.
   void UpdateLayerProperties();
 
   // Immediately return if there is a composited frame matching |size_in_dip|.
-  // Otherwise, asks ui::WindowResizeHelperMac to run tasks until a matching
-  // frame is ready, or a timeout occurs.
+  // Otherwise, calls WaitForFrame() to obtain one.
   void MaybeWaitForFrame(const gfx::Size& size_in_dip);
 
+  // Asks ui::WindowResizeHelperMac to run tasks until |predicate| returns true
+  // or |timeout_ms| passes.
+  void WaitForFrame(int timeout_ms, std::function<bool()> predicate);
+
   // Show the window using -[NSApp beginSheet:..], modal for the parent window.
   void ShowAsModalSheet();
 
   // Sets mouseDownCanMoveWindow on |bridged_view_| and triggers the NSWindow to
   // update its draggable region.
   void SetDraggable(bool draggable);
 
   // Overridden from CocoaMouseCaptureDelegate:
   void PostCapturedEvent(NSEvent* event) override;
   void OnMouseCaptureLost() override;
@@ skipping 68 matching lines @@
 
   // If true, the window has been made visible or changed shape and the window
   // shadow needs to be invalidated when a frame is received for the new shape.
   bool invalidate_shadow_on_frame_swap_ = false;
 
   // Whether the window's visibility is suppressed currently. For opaque non-
   // modal windows, the window's alpha value is set to 0, till the frame from
   // the compositor arrives to avoid "blinking".
   bool initial_visibility_suppressed_ = false;
 
+  // Set to true whenever a frame is swapped. Used to wait for a frame.
+  bool frame_swapped_ = false;
+
   AssociatedViews associated_views_;
 
   DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_