Tracing for NSMenu timelines

ui/views/cocoa/bridged_native_widget.mm

 // 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.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #import <objc/runtime.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 1045 matching lines @@
   Widget* widget = native_widget_mac_->GetWidget();
   RankNSViews(widget->GetRootView(), associated_views_, &rank);
   // Unassociated NSViews should be ordered above associated ones. The exception
   // is the UI compositor's superview, which should always be on the very
   // bottom, so give it an explicit negative rank.
   if (compositor_superview_)
     rank[compositor_superview_] = -1;
   [bridged_view_ sortSubviewsUsingFunction:&SubviewSorter context:&rank];
 }
 
+void BridgedNativeWidget::PumpCompositor() {
+  // Set the "needs commit" flag in the LayerTreeHost if isn't already set.
+  compositor_->ScheduleDraw();
+  frame_swapped_ = false;
+
+  constexpr int kPumpTimeoutMS = 100;
+  WaitForFrame(kPumpTimeoutMS, [this] { return frame_swapped_; });
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, internal::InputMethodDelegate:
 
 ui::EventDispatchDetails BridgedNativeWidget::DispatchKeyEventPostIME(
     ui::KeyEvent* key) {
   DCHECK(focus_manager_);
   native_widget_mac_->GetWidget()->OnKeyEvent(key);
   if (!key->handled()) {
     if (!focus_manager_->OnKeyEvent(*key))
       key->StopPropagation();
@@ skipping 75 matching lines @@
   if (initial_visibility_suppressed_) {
     initial_visibility_suppressed_ = false;
     [window_ setAlphaValue:1.0];
     [window_ setIgnoresMouseEvents:NO];
   }
 
   if (invalidate_shadow_on_frame_swap_) {
     invalidate_shadow_on_frame_swap_ = false;
     [window_ invalidateShadow];
   }
+
+  frame_swapped_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, BridgedNativeWidgetOwner:
 
 NSWindow* BridgedNativeWidget::GetNSWindow() {
   return window_;
 }
 
 gfx::Vector2d BridgedNativeWidget::GetChildWindowOffset() const {
@@ skipping 195 matching lines @@
   // For a translucent window, the shadow calculation needs to be carried out
   // after the frame from the compositor arrives.
   if (![window_ isOpaque])
     invalidate_shadow_on_frame_swap_ = true;
 }
 
 void BridgedNativeWidget::MaybeWaitForFrame(const gfx::Size& size_in_dip) {
   if (!layer()->IsDrawn() || compositor_widget_->HasFrameOfSize(size_in_dip))
     return;
 
-  const int kPaintMsgTimeoutMS = 50;
+  constexpr int kPaintMsgTimeoutMS = 50;
+  WaitForFrame(kPaintMsgTimeoutMS, [&, this] {
+    // Since the UI thread is blocked, the size shouldn't change.
+    DCHECK(size_in_dip == GetClientAreaSize());
+    return compositor_widget_->HasFrameOfSize(size_in_dip);
+  });
+}
+
+void BridgedNativeWidget::WaitForFrame(int timeout_ms,
+                                       std::function<bool()> predicate) {
   const base::TimeTicks start_time = base::TimeTicks::Now();
   const base::TimeTicks timeout_time =
-      start_time + base::TimeDelta::FromMilliseconds(kPaintMsgTimeoutMS);
+      start_time + base::TimeDelta::FromMilliseconds(timeout_ms);
 
   ui::WindowResizeHelperMac* resize_helper = ui::WindowResizeHelperMac::Get();
   for (base::TimeTicks now = start_time; now < timeout_time;
        now = base::TimeTicks::Now()) {
     if (!resize_helper->WaitForSingleTaskToRun(timeout_time - now))
       return;  // Timeout.
-
-    // Since the UI thread is blocked, the size shouldn't change.
-    DCHECK(size_in_dip == GetClientAreaSize());
-    if (compositor_widget_->HasFrameOfSize(size_in_dip))
+    if (predicate())
       return;  // Frame arrived.
   }
 }
 
 void BridgedNativeWidget::ShowAsModalSheet() {
   // -[NSApp beginSheet:] will block the UI thread while the animation runs.
   // So that it doesn't animate a fully transparent window, first wait for a
   // frame. The first step is to pretend that the window is already visible.
   window_visible_ = true;
   layer()->SetVisible(true);
@@ skipping 27 matching lines @@
   [bridged_view_ setMouseDownCanMoveWindow:draggable];
   // AppKit will not update its cache of mouseDownCanMoveWindow unless something
   // changes. Previously we tried adding an NSView and removing it, but for some
   // reason it required reposting the mouse-down event, and didn't always work.
   // Calling the below seems to be an effective solution.
   [window_ setMovableByWindowBackground:NO];
   [window_ setMovableByWindowBackground:YES];
 }
 
 }  // namespace views