Move display_link_mac.cc/.h from ui/accelerated_widget_mac to ui/display/mac

ui/display/mac is the right place for display_link_mac.cc and .h


Bug: 964095
Change-Id: I83d929d27b3884bd3a24eb621717ffea9af9c889
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638681
Commit-Queue: Maggie Chen <magchen@chromium.org>
Reviewed-by: ccameron <ccameron@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665271}

content/browser/renderer_host/render_widget_host_view_mac.h

@@ -25,9 +25,9 @@
 #include "ipc/ipc_sender.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
-#include "ui/accelerated_widget_mac/display_link_mac.h"
 #include "ui/base/cocoa/accessibility_focus_overrider.h"
 #include "ui/base/cocoa/remote_layer_api.h"
+#include "ui/display/mac/display_link_mac.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
 
 namespace remote_cocoa {

ui/accelerated_widget_mac/BUILD.gn

@@ -20,8 +20,6 @@ component("accelerated_widget_mac") {
     "ca_transaction_observer.mm",
     "display_ca_layer_tree.h",
     "display_ca_layer_tree.mm",
-    "display_link_mac.cc",
-    "display_link_mac.h",
     "io_surface_context.h",
     "io_surface_context.mm",
     "window_resize_helper_mac.cc",

ui/display/BUILD.gn

@@ -29,6 +29,8 @@ jumbo_component("display") {
     "display_switches.cc",
     "display_switches.h",
     "ios/screen_ios.mm",
+    "mac/display_link_mac.cc",
+    "mac/display_link_mac.h",
     "mac/screen_mac.mm",
     "screen.cc",
     "screen.h",
@@ -54,8 +56,6 @@ jumbo_component("display") {
     "win/uwp_text_scale_factor.h",
   ]
 
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
-
   defines = [ "DISPLAY_IMPLEMENTATION" ]
 
   public_deps = [
@@ -85,6 +85,7 @@ jumbo_component("display") {
     libs = [
       "AppKit.framework",
       "CoreGraphics.framework",
+      "QuartzCore.framework",
     ]
   }
 }

ui/accelerated_widget_mac/display_link_mac.cc → ui/display/mac/display_link_mac.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/accelerated_widget_mac/display_link_mac.h"
+#include "ui/display/mac/display_link_mac.h"
 
 #include <stdint.h>
 
@@ -17,15 +17,13 @@
 
 namespace base {
 
-template<>
+template <>
 struct ScopedTypeRefTraits<CVDisplayLinkRef> {
   static CVDisplayLinkRef InvalidValue() { return nullptr; }
   static CVDisplayLinkRef Retain(CVDisplayLinkRef object) {
     return CVDisplayLinkRetain(object);
   }
-  static void Release(CVDisplayLinkRef object) {
-    CVDisplayLinkRelease(object);
-  }
+  static void Release(CVDisplayLinkRef object) { CVDisplayLinkRelease(object); }
 };
 
 }  // namespace base
@@ -40,6 +38,10 @@ namespace {
 // is initialized with the very first DisplayLinkMac instance, and is never
 // changed (even, e.g, in tests that re-initialize the main thread task runner).
 // https://885329
+// TODO(ccameron): crbug.com/969157 - Save this ask_runner to DisaplayLinkMac.
+// configs += [ "//build/config/compiler:wexit_time_destructors" ] in
+// ui/display/BUILD.gn has to be removed because GetMainThreadTaskRunner()
+// causes a compiler error.
 scoped_refptr<base::SingleThreadTaskRunner> GetMainThreadTaskRunner() {
   static scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       base::ThreadTaskRunnerHandle::Get();
@@ -80,9 +82,8 @@ scoped_refptr<DisplayLinkMac> DisplayLinkMac::GetForDisplay(
   CVReturn ret = kCVReturnSuccess;
 
   base::ScopedTypeRef<CVDisplayLinkRef> display_link;
-  ret = CVDisplayLinkCreateWithCGDisplay(
-      display_id,
-      display_link.InitializeInto());
+  ret = CVDisplayLinkCreateWithCGDisplay(display_id,
+                                         display_link.InitializeInto());
   if (ret != kCVReturnSuccess) {
     LOG(ERROR) << "CVDisplayLinkCreateWithActiveCGDisplays failed: " << ret;
     return nullptr;
@@ -111,8 +112,7 @@ DisplayLinkMac::DisplayLinkMac(
     CGError register_error = CGDisplayRegisterReconfigurationCallback(
         DisplayReconfigurationCallBack, nullptr);
     DPLOG_IF(ERROR, register_error != kCGErrorSuccess)
-        << "CGDisplayRegisterReconfigurationCallback: "
-        << register_error;
+        << "CGDisplayRegisterReconfigurationCallback: " << register_error;
   }
   all_display_links.insert(std::make_pair(display_id_, this));
 }
@@ -129,13 +129,12 @@ DisplayLinkMac::~DisplayLinkMac() {
     CGError remove_error = CGDisplayRemoveReconfigurationCallback(
         DisplayReconfigurationCallBack, nullptr);
     DPLOG_IF(ERROR, remove_error != kCGErrorSuccess)
-        << "CGDisplayRemoveReconfigurationCallback: "
-        << remove_error;
+        << "CGDisplayRemoveReconfigurationCallback: " << remove_error;
   }
 }
 
-bool DisplayLinkMac::GetVSyncParameters(
-    base::TimeTicks* timebase, base::TimeDelta* interval) {
+bool DisplayLinkMac::GetVSyncParameters(base::TimeTicks* timebase,
+                                        base::TimeDelta* interval) {
   if (!timebase_and_interval_valid_) {
     StartOrContinueDisplayLink();
     return false;
@@ -200,8 +199,7 @@ void DisplayLinkMac::UpdateVSyncParameters(const CVTimeStamp& cv_time) {
   timebase_and_interval_valid_ = true;
 
   // Don't restart the display link for 10 seconds.
-  recalculate_time_ = base::TimeTicks::Now() +
-                      base::TimeDelta::FromSeconds(10);
+  recalculate_time_ = base::TimeTicks::Now() + base::TimeDelta::FromSeconds(10);
   StopDisplayLink();
 }
 
@@ -224,13 +222,12 @@ void DisplayLinkMac::StopDisplayLink() {
 }
 
 // static
-CVReturn DisplayLinkMac::DisplayLinkCallback(
-    CVDisplayLinkRef display_link,
-    const CVTimeStamp* now,
-    const CVTimeStamp* output_time,
-    CVOptionFlags flags_in,
-    CVOptionFlags* flags_out,
-    void* context) {
+CVReturn DisplayLinkMac::DisplayLinkCallback(CVDisplayLinkRef display_link,
+                                             const CVTimeStamp* now,
+                                             const CVTimeStamp* output_time,
+                                             CVOptionFlags flags_in,
+                                             CVOptionFlags* flags_out,
+                                             void* context) {
   TRACE_EVENT0("ui", "DisplayLinkMac::DisplayLinkCallback");
   CGDirectDisplayID display =
       static_cast<CGDirectDisplayID>(reinterpret_cast<uintptr_t>(context));
@@ -254,4 +251,4 @@ void DisplayLinkMac::DisplayReconfigurationCallBack(
   display_link_mac->timebase_and_interval_valid_ = false;
 }
 
-}  // ui
+}  // namespace ui

ui/accelerated_widget_mac/display_link_mac.h → ui/display/mac/display_link_mac.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_ACCELERATED_WIDGET_MAC_DISPLAY_LINK_MAC_H_
-#define UI_ACCELERATED_WIDGET_MAC_DISPLAY_LINK_MAC_H_
+#ifndef UI_DISPLAY_MAC_DISPLAY_LINK_MAC_H_
+#define UI_DISPLAY_MAC_DISPLAY_LINK_MAC_H_
 
 #include <QuartzCore/CVDisplayLink.h>
 
@@ -12,11 +12,11 @@
 #include "base/mac/scoped_typeref.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
-#include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h"
+#include "ui/display/display_export.h"
 
 namespace ui {
 
-class ACCELERATED_WIDGET_MAC_EXPORT DisplayLinkMac
+class DISPLAY_EXPORT DisplayLinkMac
     : public base::RefCountedThreadSafe<DisplayLinkMac> {
  public:
   // This must only be called from the main thread.
@@ -25,16 +25,13 @@ class ACCELERATED_WIDGET_MAC_EXPORT DisplayLinkMac
 
   // Get vsync scheduling parameters. Returns false if the populated parameters
   // are invalid.
-  bool GetVSyncParameters(
-      base::TimeTicks* timebase,
-      base::TimeDelta* interval);
+  bool GetVSyncParameters(base::TimeTicks* timebase, base::TimeDelta* interval);
 
  private:
   friend class base::RefCountedThreadSafe<DisplayLinkMac>;
 
-  DisplayLinkMac(
-      CGDirectDisplayID display_id,
-      base::ScopedTypeRef<CVDisplayLinkRef> display_link);
+  DisplayLinkMac(CGDirectDisplayID display_id,
+                 base::ScopedTypeRef<CVDisplayLinkRef> display_link);
   virtual ~DisplayLinkMac();
 
   void StartOrContinueDisplayLink();
@@ -50,20 +47,18 @@ class ACCELERATED_WIDGET_MAC_EXPORT DisplayLinkMac
 
   // Called by the system on the display link thread, and posts a call to
   // DoUpdateVSyncParameters() to the UI thread.
-  static CVReturn DisplayLinkCallback(
-      CVDisplayLinkRef display_link,
-      const CVTimeStamp* now,
-      const CVTimeStamp* output_time,
-      CVOptionFlags flags_in,
-      CVOptionFlags* flags_out,
-      void* context);
+  static CVReturn DisplayLinkCallback(CVDisplayLinkRef display_link,
+                                      const CVTimeStamp* now,
+                                      const CVTimeStamp* output_time,
+                                      CVOptionFlags flags_in,
+                                      CVOptionFlags* flags_out,
+                                      void* context);
 
   // This is called whenever the display is reconfigured, and marks that the
   // vsync parameters must be recalculated.
-  static void DisplayReconfigurationCallBack(
-      CGDirectDisplayID display,
-      CGDisplayChangeSummaryFlags flags,
-      void* user_info);
+  static void DisplayReconfigurationCallBack(CGDirectDisplayID display,
+                                             CGDisplayChangeSummaryFlags flags,
+                                             void* user_info);
 
   // The display that this display link is attached to.
   CGDirectDisplayID display_id_;
@@ -81,6 +76,6 @@ class ACCELERATED_WIDGET_MAC_EXPORT DisplayLinkMac
   base::TimeTicks recalculate_time_;
 };
 
-}  // ui
+}  // namespace ui
 
-#endif  // UI_ACCELERATED_WIDGET_MAC_DISPLAY_LINK_MAC_H_
+#endif  // UI_DISPLAY_MAC_DISPLAY_LINK_MAC_H_

ui/views/cocoa/bridged_native_widget_host_impl.h

@@ -17,10 +17,10 @@
 #include "components/remote_cocoa/common/bridged_native_widget_host.mojom.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
-#include "ui/accelerated_widget_mac/display_link_mac.h"
 #include "ui/base/cocoa/accessibility_focus_overrider.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/compositor/layer_owner.h"
+#include "ui/display/mac/display_link_mac.h"
 #include "ui/views/cocoa/drag_drop_client_mac.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/views_export.h"