Make HitTestAsyncQueriedDebugRegion private to HitTestManager

HitTestAsyncQueriedDebugRegion is currently defined in an anonymous
namespace in hit_test_manager.h, so each translation unit gets a
seperate definition of it with internal linkage. I presume the intent
here was to have HitTestAsyncQueriedDebugRegion be private to
HitTestManager, so we now define it accordingly.

Bug: None
Change-Id: Ic546f42f6808ae25ed7f948677e6304c04ef43ec
Reviewed-on: https://chromium-review.googlesource.com/c/1405698Reviewed-by: Ria Jiang <riajiang@chromium.org>
Commit-Queue: Kevin McNee <mcnee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622142}

components/viz/service/hit_test/hit_test_manager.cc

@@ -13,20 +13,22 @@ namespace {
 // TODO(gklassen): Review and select appropriate sizes based on
 // telemetry / UMA.
 constexpr uint32_t kMaxRegionsPerSurface = 1024;
+}  // namespace
 
-HitTestAsyncQueriedDebugRegion::HitTestAsyncQueriedDebugRegion() = default;
-HitTestAsyncQueriedDebugRegion::HitTestAsyncQueriedDebugRegion(
+HitTestManager::HitTestAsyncQueriedDebugRegion::
+    HitTestAsyncQueriedDebugRegion() = default;
+HitTestManager::HitTestAsyncQueriedDebugRegion::HitTestAsyncQueriedDebugRegion(
     base::flat_set<FrameSinkId> regions)
     : regions(std::move(regions)) {}
-HitTestAsyncQueriedDebugRegion::~HitTestAsyncQueriedDebugRegion() = default;
+HitTestManager::HitTestAsyncQueriedDebugRegion::
+    ~HitTestAsyncQueriedDebugRegion() = default;
 
-HitTestAsyncQueriedDebugRegion::HitTestAsyncQueriedDebugRegion(
+HitTestManager::HitTestAsyncQueriedDebugRegion::HitTestAsyncQueriedDebugRegion(
     HitTestAsyncQueriedDebugRegion&&) = default;
-HitTestAsyncQueriedDebugRegion& HitTestAsyncQueriedDebugRegion::operator=(
+HitTestManager::HitTestAsyncQueriedDebugRegion&
+HitTestManager::HitTestAsyncQueriedDebugRegion::operator=(
     HitTestAsyncQueriedDebugRegion&&) = default;
 
-}  // namespace
-
 HitTestManager::HitTestManager(SurfaceManager* surface_manager)
     : surface_manager_(surface_manager) {}
 

components/viz/service/hit_test/hit_test_manager.h

@@ -16,22 +16,6 @@
 
 namespace viz {
 
-namespace {
-
-struct HitTestAsyncQueriedDebugRegion {
-  HitTestAsyncQueriedDebugRegion();
-  explicit HitTestAsyncQueriedDebugRegion(base::flat_set<FrameSinkId> regions);
-  ~HitTestAsyncQueriedDebugRegion();
-
-  HitTestAsyncQueriedDebugRegion(HitTestAsyncQueriedDebugRegion&&);
-  HitTestAsyncQueriedDebugRegion& operator=(HitTestAsyncQueriedDebugRegion&&);
-
-  base::flat_set<FrameSinkId> regions;
-  base::ElapsedTimer timer;
-};
-
-}  // namespace
-
 class LatestLocalSurfaceIdLookupDelegate;
 
 // HitTestManager manages the collection of HitTestRegionList objects
@@ -91,6 +75,19 @@ class VIZ_SERVICE_EXPORT HitTestManager : public SurfaceObserver {
   std::map<SurfaceId, base::flat_map<uint64_t, HitTestRegionList>>
       hit_test_region_lists_;
 
+  struct HitTestAsyncQueriedDebugRegion {
+    HitTestAsyncQueriedDebugRegion();
+    explicit HitTestAsyncQueriedDebugRegion(
+        base::flat_set<FrameSinkId> regions);
+    ~HitTestAsyncQueriedDebugRegion();
+
+    HitTestAsyncQueriedDebugRegion(HitTestAsyncQueriedDebugRegion&&);
+    HitTestAsyncQueriedDebugRegion& operator=(HitTestAsyncQueriedDebugRegion&&);
+
+    base::flat_set<FrameSinkId> regions;
+    base::ElapsedTimer timer;
+  };
+
   // We store the async queried regions for each |root_frame_sink_id|. If viz
   // hit-test debug is enabled, We will highlight the regions red in
   // HitTestAggregator for 2 seconds, or until the next async queried event.