Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: components/viz/service/hit_test/hit_test_aggregator.cc

Issue 2938953002: Implement HitTestAggregator (Closed)
Patch Set: improvements based on reviewer comments Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/viz/service/hit_test/hit_test_aggregator.cc
diff --git a/components/viz/service/hit_test/hit_test_aggregator.cc b/components/viz/service/hit_test/hit_test_aggregator.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0d08e619a7a225bde3d822becd7a704dcf3af116
--- /dev/null
+++ b/components/viz/service/hit_test/hit_test_aggregator.cc
@@ -0,0 +1,222 @@
+// 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.
+
+#include "components/viz/service/hit_test/hit_test_aggregator.h"
+#include "components/viz/common/hit_test/display_hit_test_data.h"
+
+namespace viz {
+namespace hit_test {
+
+namespace {
+// TODO(gklassen): Review and select appropriate sizes ( based on
+// telemetry / UMA? ).
+constexpr int kInitialSize = 1024;
+constexpr int kIncrementalSize = 1024;
+
+bool ValidateHitTestRegion(
+ const hit_test::mojom::HitTestRegionPtr& hit_test_region) {
+ if (hit_test_region->flags == hit_test::mojom::kHitTestChildSurface) {
+ if (!hit_test_region->surface_id.is_valid())
+ return false;
+ }
+ return true;
+}
+bool ValidateHitTestData(const hit_test::mojom::HitTestDataPtr& hit_test_data) {
+ for (auto& region : hit_test_data->regions) {
+ if (!ValidateHitTestRegion(region)) {
varkha 2017/06/20 19:56:59 nit: no need for {}
gklassen 2017/06/26 21:55:19 Done.
+ return false;
+ }
+ }
+ return true;
+}
+
+} // namespace
+
+HitTestAggregator::HitTestAggregator(
+ std::unique_ptr<DisplayHitTestDataFactory> display_hit_test_data_factory)
+ : active_region_count_(0),
+ display_hit_test_data_factory_(std::move(display_hit_test_data_factory)),
+ weak_ptr_factory_(this) {
+ AllocateDisplayHitTestData();
+}
+HitTestAggregator::~HitTestAggregator() {}
+
+void HitTestAggregator::SubmitHitTestData(
+ hit_test::mojom::HitTestDataPtr hit_test_data) {
+ DCHECK(ValidateHitTestData(hit_test_data));
+ // TODO(gklassen): Runtime validation that hit_test_data is valid.
+ // TODO(gklassen): Inform FrameSink that the hit_test_data is invalid.
+ // TODO(gklassen): FrameSink needs to inform the host of a difficult renderer.
+ pending_[hit_test_data->surface_id] = std::move(hit_test_data);
+}
+
+bool HitTestAggregator::OnSurfaceDamaged(const cc::SurfaceId& surface_id,
+ const cc::BeginFrameAck& ack) {
+ return false;
+}
+
+void HitTestAggregator::OnSurfaceDiscarded(const cc::SurfaceId& surface_id) {
+ pending_.erase(surface_id);
+ active_.erase(surface_id);
+}
+
+void HitTestAggregator::OnSurfaceWillDraw(const cc::SurfaceId& surface_id) {
+ auto pending_search = pending_.find(surface_id);
+ if (pending_search == pending_.end()) {
+ // Have already activated pending hit_test_data objects for this surface.
+ return;
+ }
+ hit_test::mojom::HitTestData* hit_test_data = pending_search->second.get();
+
+ // Update the region count.
+ auto active_search = active_.find(surface_id);
+ if (active_search != active_.end()) {
+ hit_test::mojom::HitTestData* old_hit_test_data =
+ active_search->second.get();
+ active_region_count_ -= old_hit_test_data->regions.size();
+ }
+ active_region_count_ += hit_test_data->regions.size();
+ DCHECK_GE(active_region_count_, 0);
+
+ active_[surface_id] = std::move(pending_[surface_id]);
+ pending_.erase(surface_id);
+}
+
+void HitTestAggregator::AllocateDisplayHitTestData() {
+ AllocateDisplayHitTestData(kInitialSize);
+}
+
+void HitTestAggregator::AllocateDisplayHitTestData(int length) {
+ size_t byte_count =
+ sizeof(DisplayHitTestData) + length * sizeof(DisplayHitTestRegion);
+ display_hit_test_data_ = (DisplayHitTestData*)malloc(byte_count);
+
+ display_hit_test_data_->length = length;
+ display_hit_test_data_->read_offset = 0;
+ display_hit_test_data_->regions[0].child_count = kEndOfList;
+ display_hit_test_data_->regions[length / 2].child_count = kEndOfList;
+}
+
+void HitTestAggregator::ResizeDisplayHitTestData(int length) {
+ DisplayHitTestData* old_display_hit_test_data = display_hit_test_data_;
+
+ AllocateDisplayHitTestData(length);
+
+ // Copy over the current data and then mark the old structure
+ // as invalid so that clients will re-acquire their reference.
+ int old_length = old_display_hit_test_data->length;
+ int new_length = display_hit_test_data_->length;
+ DCHECK(new_length > old_length);
+ memcpy(display_hit_test_data_->regions, old_display_hit_test_data->regions,
+ old_length * sizeof(DisplayHitTestRegion));
+
+ old_display_hit_test_data->read_offset = kOldPleaseReAcquire;
+}
+
+void HitTestAggregator::PostTaskAggregate(cc::SurfaceId display_surface_id) {
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+ base::BindOnce(&HitTestAggregator::Aggregate,
+ weak_ptr_factory_.GetWeakPtr(), display_surface_id));
+}
+
+void HitTestAggregator::Aggregate(cc::SurfaceId display_surface_id) {
+ // Size check.
+ int length = display_hit_test_data_->length / 2;
+ // TODO(gklassen): sharpen this estimate
+ int max_size = active_region_count_ * 2;
+ if (max_size > length) {
+ while (length < max_size) {
varkha 2017/06/20 19:56:59 nit: no need for {}
gklassen 2017/06/26 21:55:19 Done.
+ length += kIncrementalSize;
+ }
+
+ ResizeDisplayHitTestData(length);
+ }
+
+ int index = GetBackIndex();
+ int last_index = AppendRoot(display_surface_id, index);
+ display_hit_test_data_->regions[last_index].child_count = kEndOfList;
+}
+
+int HitTestAggregator::AppendRoot(cc::SurfaceId surface_id, int index) {
+ auto search = active_.find(surface_id);
+ if (search == active_.end()) {
+ // Referenced surface not found ( it may be late ).
+ return index;
+ }
+ hit_test::mojom::HitTestData* hit_test_data = search->second.get();
+
+ DisplayHitTestRegion* element = &display_hit_test_data_->regions[index];
+
+ element->frame_sink_id = hit_test_data->surface_id.frame_sink_id();
+ element->flags = hit_test_data->flags;
+ element->rect = hit_test_data->bounds;
+ element->transform = hit_test_data->transform;
+
+ int parent_index = index++;
+
+ for (auto& region : hit_test_data->regions) {
varkha 2017/06/20 19:56:59 nit ditto.
gklassen 2017/06/26 21:55:19 Done.
+ index = AppendRegion(region, index);
+ }
+ DCHECK_GE(index - parent_index - 1, 0);
+ element->child_count = index - parent_index - 1;
+ return index;
+}
+
+int HitTestAggregator::AppendRegion(
+ const hit_test::mojom::HitTestRegionPtr& region,
+ int index) {
+ DisplayHitTestRegion* element = &display_hit_test_data_->regions[index];
+
+ element->frame_sink_id = region->surface_id.frame_sink_id();
+ element->flags = region->flags;
+ element->rect = region->rect;
+ element->transform = region->transform;
+
+ int parent_index = index++;
+
+ if (region->flags == hit_test::mojom::kHitTestChildSurface) {
+ auto search = active_.find(region->surface_id);
+ if (search == active_.end()) {
+ // Surface HitTestData not found - it may be late.
+ // Don't include this region so that it doesn't receive events.
+ // TODO(gklassen): create test case for this case.
+ return parent_index;
+ }
+
+ // Rather than add a node in the tree for this hit_test_data element
+ // we can simplify the tree by merging the flags and transform into
+ // the kHitTestChildSurface element.
+ hit_test::mojom::HitTestData* hit_test_data = search->second.get();
+ if (!hit_test_data->transform.IsIdentity()) {
+ // TODO(gklassen): Add test case to validate this.
+ element->transform.PreconcatTransform(hit_test_data->transform);
+ }
+ element->flags |= hit_test_data->flags;
+
+ for (auto& child_region : hit_test_data->regions) {
varkha 2017/06/20 19:56:59 nit: ditto.
gklassen 2017/06/26 21:55:19 Done.
+ index = AppendRegion(child_region, index);
+ }
+ }
+ DCHECK_GE(index - parent_index - 1, 0);
+ element->child_count = index - parent_index - 1;
+ return index;
+}
+
+void HitTestAggregator::Swap() {
+ display_hit_test_data_->read_offset = GetBackIndex();
+}
+
+int HitTestAggregator::GetBackIndex() {
+ if (display_hit_test_data_->read_offset == 0)
+ return display_hit_test_data_->length / 2;
+ return 0;
+}
+
+DisplayHitTestRegion* HitTestAggregator::GetCurrentRegions() {
+ return display_hit_test_data_->regions + display_hit_test_data_->read_offset;
+}
+
+} // namespace hit_test
+} // namespace viz

Powered by Google App Engine
This is Rietveld 408576698