Implement HitTestAggregator

components/viz/hit_test/hit_test_aggregator.h

Index: components/viz/hit_test/hit_test_aggregator.h
diff --git a/components/viz/hit_test/hit_test_aggregator.h b/components/viz/hit_test/hit_test_aggregator.h
new file mode 100644
index 0000000000000000000000000000000000000000..d8668b10010ea2d0f6a556f71905a9cb0f5164f8
--- /dev/null
+++ b/components/viz/hit_test/hit_test_aggregator.h
@@ -0,0 +1,110 @@
+// Copyright 2017 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 COMPONENTS_VIZ_HIT_TEST_HIT_TEST_AGGREGATOR_H_

[rjkroege, 2017/06/15 21:58:44]

structuring convention: components/viz/service/hit_test for this code

[gklassen, 2017/06/16 21:49:39]

Done.

+#define COMPONENTS_VIZ_HIT_TEST_HIT_TEST_AGGREGATOR_H_
+
+#include <stdint.h>

[rjkroege, 2017/06/15 21:58:44]

check for unnecessary includes?

[gklassen, 2017/06/16 21:49:39]

Done.

( is there a script or other tool to make this easy? )

+
+#include <map>
+#include <memory>
+
+#include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_observer.h"
+#include "components/viz/hit_test/display_hit_test_data.h"
+#include "components/viz/hit_test/display_hit_test_data_factory.h"
+#include "components/viz/hit_test/hit_test_export.h"
+#include "components/viz/hit_test/public/interfaces/hit_test_data.mojom.h"

[rjkroege, 2017/06/15 21:58:44]

Please move stuff around per discussion in person.

[gklassen, 2017/06/16 21:49:39]

Done.

+
+namespace viz {
+namespace hit_test {
+
+namespace test {
+class HitTestAggregatorTest;
+}
+
+// HitTest maintains maping between display regions and associated surfaces
+// in shared memory to enable efficient hit testing across processes.
+//
+// This is intended to be created in the viz or GPU process. For mus+ash this
+// will be true after the mus process split.
+
+using HitTestDataMap = std::map<cc::SurfaceId, hit_test::mojom::HitTestDataPtr>;
+
+class HIT_TEST_EXPORT HitTestAggregator : public cc::SurfaceObserver {
+ public:
+  HitTestAggregator(
+      std::unique_ptr<DisplayHitTestDataFactory> display_hit_test_data_factory);
+  ~HitTestAggregator();
+
+  // Called when HitTestData is submitted along with every call
+  // to SubmitCompositorFrame.  This is collected in pending_ until
+  // surfaces are aggregated and put on the display.
+  void SubmitHitTestData(hit_test::mojom::HitTestDataPtr hit_test_data);
+
+  // Called after surfaces have been aggregated into the DisplayFrame.
+  // In this call HitTestData structures received from active surfaces
+  // are aggregated into the DisplayHitTestData structure in
+  // shared memory used for event targetting.
+  void PostTaskAggregate(cc::SurfaceId display_surface_id);
+  void Aggregate(cc::SurfaceId display_surface_id);

[rjkroege, 2017/06/15 21:58:44]

Aggregate can have a separate description?

[gklassen, 2017/06/16 21:49:39]

Done.

+
+  // Called at BeginFrame to swap buffers in shared memory.

[rjkroege, 2017/06/15 21:58:44]

see my previous blither about other way to do this.

[gklassen, 2017/06/16 21:49:39]

Thank you.  I will investigate.  Any pointers to the existing path / message
would be appreciated. 

+  void Swap();
+
+  // SurfaceObserver

[rjkroege, 2017/06/15 21:58:44]

overrides can be private.

[gklassen, 2017/06/16 21:49:39]

Done.

+  void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override {}
+  void OnSurfaceDestroyed(const cc::SurfaceId& surface_id) override {}
+  bool OnSurfaceDamaged(const cc::SurfaceId& surface_id,
+                        const cc::BeginFrameAck& ack) override;
+  void OnSurfaceDiscarded(const cc::SurfaceId& surface_id) override;
+  void OnSurfaceDamageExpected(const cc::SurfaceId& surface_id,
+                               const cc::BeginFrameArgs& args) override {}
+  // Called when a surface has been aggregated and added to the
+  // display frame.  HitTestData objects are held but ignored until
+  // this happens.  HitTestData for the surface is copied from pending_
+  // to active_ in this method.
+  void OnSurfaceWillDraw(const cc::SurfaceId& surface_id) override;
+
+  DisplayHitTestData* GetDisplayHitTestData();

[rjkroege, 2017/06/15 21:58:44]

do we need? why?

[gklassen, 2017/06/16 21:49:39]

Done.

+  DisplayHitTestRegion* GetCurrentRegions();
+
+ private:
+  friend class test::HitTestAggregatorTest;
+
+  HitTestDataMap pending_;
+  HitTestDataMap active_;
+
+  // Keep track of the number of regions in the active list
+  // so that we know when we exceed the available length.
+  int active_region_count_;
+
+  std::unique_ptr<DisplayHitTestDataFactory> display_hit_test_data_factory_;
+
+  DisplayHitTestData* display_hit_test_data_;
+
+  // Allocates memory for the DisplayHitTestData Structure.
+  void AllocateDisplayHitTestData();
+  void AllocateDisplayHitTestData(int length);
+
+  // Resize the memory for the DispalyHitTestData Structure.

[rjkroege, 2017/06/15 21:58:44]

DisplayHitTestData

[gklassen, 2017/06/16 21:49:39]

Done.

Good eye.  Thank you. 

+  // Copies current data and marks the structure
+  void ResizeDisplayHitTestData(int length);
+
+  int GetBackIndex();
+
+  int Append(cc::SurfaceId surface_id, int index);
+  int Append(const hit_test::mojom::HitTestRegionPtr& region, int index);
+
+  // WeakPtr to handle the case when this object is deleted after
+  // the PostTaskAggregation call is scheduled but before invocation.
+  base::WeakPtrFactory<HitTestAggregator> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(HitTestAggregator);
+};
+
+}  // namespace hit_test
+}  // namespace viz
+
+#endif  //  COMPONENTS_VIZ_HIT_TEST_HIT_TEST_AGGREGATOR_H_