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

Unified Diff: components/viz/host/hit_test/hit_test_query.cc

Issue 2933493003: Add viz-host HitTestQuery. (Closed)
Patch Set: build file Created 3 years, 5 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/host/hit_test/hit_test_query.cc
diff --git a/components/viz/host/hit_test/hit_test_query.cc b/components/viz/host/hit_test/hit_test_query.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2fdc9accf9f6e8942e9e899134312e947bb8900d
--- /dev/null
+++ b/components/viz/host/hit_test/hit_test_query.cc
@@ -0,0 +1,61 @@
+// 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/host/hit_test/hit_test_query.h"
+
+#include "services/viz/hit_test/public/interfaces/hit_test_region_list.mojom.h"
+
+namespace viz {
+
+HitTestQuery::HitTestQuery() = default;
+
+HitTestQuery::~HitTestQuery() = default;
+
+Target HitTestQuery::FindTargetForLocation(const gfx::Point& location_in_root) {
+ Target target;
+ if (!aggregated_hit_test_region_list_size_)
+ return target;
+
+ FindTargetInRegionForLocation(location_in_root,
+ aggregated_hit_test_region_list_, &target);
+ return target;
rjkroege 2017/07/18 21:38:49 I am generally opposed to return-by-value here. Th
+}
+
+bool HitTestQuery::FindTargetInRegionForLocation(
+ const gfx::Point& location_in_parent,
+ AggregatedHitTestRegion* region,
+ Target* target) const {
+ gfx::Point location_transformed(location_in_parent);
+ region->transform.TransformPoint(&location_transformed);
rjkroege 2017/07/18 21:38:49 region data cannot be trusted. Please file a bug f
sadrul 2017/07/19 15:40:08 The TODO can probably go in the SetAggregatedHitTe
sadrul 2017/07/19 15:40:08 Can you explain why you are doing the transform he
riajiang 2017/07/19 17:45:55 Done. http://crbug.com/746470
riajiang 2017/07/19 17:45:55 Because we need to transform from parent's coordin
riajiang 2017/07/19 19:22:14 As discussed offline, transformation needed here.
+ if (!region->rect.Contains(location_transformed))
+ return false;
+
+ AggregatedHitTestRegion* child_region = region + 1;
+ AggregatedHitTestRegion* child_region_end = region + region->child_count;
+ if (child_region_end > (aggregated_hit_test_region_list_ +
sadrul 2017/07/19 15:40:08 Should be >= here, right?
riajiang 2017/07/19 17:45:55 This is > now since I changed |child_region_end| b
+ aggregated_hit_test_region_list_size_)) {
+ return false;
+ }
+
+ gfx::Point location_in_target(location_transformed);
+ location_in_target.Offset(-region->rect.x(), -region->rect.y());
+ while (child_region <= child_region_end) {
sadrul 2017/07/19 15:40:08 Should be < For the regular iterators, we exclude
riajiang 2017/07/19 17:45:55 Okay I see. Changed |child_region_end| to be |chil
+ if (FindTargetInRegionForLocation(location_in_target, child_region,
+ target)) {
+ return true;
+ }
+
+ child_region = child_region + child_region->child_count + 1;
rjkroege 2017/07/18 21:38:49 if any child_count > child_region_count, you need
riajiang 2017/07/19 17:45:55 Added in the bug.
+ }
+
+ if (region->flags & mojom::kHitTestMine) {
+ target->frame_sink_id = region->frame_sink_id;
rjkroege 2017/07/18 21:38:49 the viz/host has a window <-> framesink map. there
riajiang 2017/07/19 17:45:55 I didn't find it in viz/host - is it existing code
rjkroege 2017/07/19 18:01:25 so: viz-host is code in the mus-ws process. we nee
riajiang 2017/07/19 19:22:14 I see, will do when adding the map.
+ target->location_in_target = location_in_target;
+ target->flags = region->flags;
rjkroege 2017/07/18 21:38:49 invalid flags should be reported as a security fau
riajiang 2017/07/19 17:45:55 Added in the bug.
+ return true;
+ }
+ return false;
+}
+
+} // namespace viz

Powered by Google App Engine
This is Rietveld 408576698