Mozart: The great RectF-ication.

mojo/ui/associates/view_tree_hit_tester_client_apptest.cc

 // Copyright 2016 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 "mojo/ui/associates/view_tree_hit_tester_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 20 matching lines @@
     view_inspector_client_ =
         new mojo::ui::ViewInspectorClient(view_inspector_ptr.Pass());
 
     view_tree_token_ = mojo::ui::ViewTreeToken::New();
     view_tree_token_->value = 1u;
     view_tree_hit_tester_client_ = new mojo::ui::ViewTreeHitTesterClient(
         view_inspector_client_, view_tree_token_.Clone());
   }
 
  protected:
-  void HitTest(mojo::PointPtr point,
+  void HitTest(mojo::PointFPtr point,
                scoped_ptr<mojo::ui::ResolvedHits>* resolved_hits) {
     base::RunLoop loop;
     view_tree_hit_tester_client_->HitTest(
         point.Pass(), base::Bind(&Capture<scoped_ptr<mojo::ui::ResolvedHits>>,
                                  loop.QuitClosure(), resolved_hits));
     loop.Run();
   }
 
   mojo::ui::MockViewInspector view_inspector_;
   mojo::Binding<mojo::ui::ViewInspector> view_inspector_binding_;
   scoped_refptr<mojo::ui::ViewInspectorClient> view_inspector_client_;
 
   mojo::ui::ViewTreeTokenPtr view_tree_token_;
   scoped_refptr<mojo::ui::ViewTreeHitTesterClient> view_tree_hit_tester_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewTreeHitTesterClientTest);
 };
 
 TEST_F(ViewTreeHitTesterClientTest, NoHitTester) {
   scoped_ptr<mojo::ui::ResolvedHits> resolved_hits;
-  HitTest(MakePoint(0, 0), &resolved_hits);
+  HitTest(MakePointF(0.f, 0.f), &resolved_hits);
   EXPECT_EQ(nullptr, resolved_hits.get());
 }
 
 TEST_F(ViewTreeHitTesterClientTest, HaveHitTester) {
   auto scene_token_1 = MakeDummySceneToken(1u);
   auto view_token_11 = MakeDummyViewToken(11u);
   auto transform_111 = MakeDummyTransform(111);
   auto transform_222 = MakeDummyTransform(222);
   auto transform_333 = MakeDummyTransform(333);
   view_inspector_.SetSceneMapping(scene_token_1->value, view_token_11.Clone());
 
   mojo::ui::MockHitTester hit_tester;
   view_inspector_.SetHitTester(view_tree_token_->value, &hit_tester);
 
   // Simple hit test with the first hit tester.
   hit_tester.SetNextResult(
-      MakePoint(2, 5),
+      MakePointF(2.f, 5.f),
       MakeSimpleHitTestResult(scene_token_1.Clone(), transform_111.Clone()));
   scoped_ptr<mojo::ui::ResolvedHits> resolved_hits;
-  HitTest(MakePoint(2, 5), &resolved_hits);
+  HitTest(MakePointF(2.f, 5.f), &resolved_hits);
   ASSERT_NE(nullptr, resolved_hits.get());
   EXPECT_NE(nullptr, resolved_hits->result());
   EXPECT_EQ(1u, resolved_hits->map().size());
   EXPECT_TRUE(
       view_token_11.Equals(resolved_hits->map().at(scene_token_1->value)));
   EXPECT_TRUE(transform_111.Equals(
       resolved_hits->result()->root->hits[0]->get_node()->transform));
   EXPECT_EQ(1u, view_inspector_.hit_tester_lookups());
   EXPECT_EQ(1u, view_inspector_.scene_lookups());
 
   // Do it again, should reuse the same hit tester.
   hit_tester.SetNextResult(
-      MakePoint(3, 4),
+      MakePointF(3.f, 4.f),
       MakeSimpleHitTestResult(scene_token_1.Clone(), transform_222.Clone()));
-  HitTest(MakePoint(3, 4), &resolved_hits);
+  HitTest(MakePointF(3.f, 4.f), &resolved_hits);
   ASSERT_NE(nullptr, resolved_hits.get());
   EXPECT_NE(nullptr, resolved_hits->result());
   EXPECT_EQ(1u, resolved_hits->map().size());
   EXPECT_TRUE(
       view_token_11.Equals(resolved_hits->map().at(scene_token_1->value)));
   EXPECT_TRUE(transform_222.Equals(
       resolved_hits->result()->root->hits[0]->get_node()->transform));
   EXPECT_EQ(1u, view_inspector_.hit_tester_lookups());
   EXPECT_EQ(1u, view_inspector_.scene_lookups());
 
   // Replace the hit tester, ensuring that another lookup occurs.
   mojo::ui::MockHitTester hit_tester_2;
   {
     base::RunLoop loop;
     view_tree_hit_tester_client_->set_hit_tester_changed_callback(
         loop.QuitClosure());
     view_inspector_.SetHitTester(view_tree_token_->value, &hit_tester_2);
     loop.Run();
   }
 
   // Try to use the new hit tester.
   hit_tester_2.SetNextResult(
-      MakePoint(7, 8),
+      MakePointF(7.f, 8.f),
       MakeSimpleHitTestResult(scene_token_1.Clone(), transform_333.Clone()));
-  HitTest(MakePoint(7, 8), &resolved_hits);
+  HitTest(MakePointF(7.f, 8.f), &resolved_hits);
   ASSERT_NE(nullptr, resolved_hits.get());
   EXPECT_NE(nullptr, resolved_hits->result());
   EXPECT_EQ(1u, resolved_hits->map().size());
   EXPECT_TRUE(
       view_token_11.Equals(resolved_hits->map().at(scene_token_1->value)));
   EXPECT_TRUE(transform_333.Equals(
       resolved_hits->result()->root->hits[0]->get_node()->transform));
   EXPECT_EQ(2u, view_inspector_.hit_tester_lookups());
   EXPECT_EQ(1u, view_inspector_.scene_lookups());
 
   // Cause the hit tester to be closed.
   {
     base::RunLoop loop;
     view_tree_hit_tester_client_->set_hit_tester_changed_callback(
         loop.QuitClosure());
     view_inspector_.CloseHitTesterBindings();
     loop.Run();
   }
 
   // Hit testing should not work anymore.
-  HitTest(MakePoint(0, 0), &resolved_hits);
+  HitTest(MakePointF(0.f, 0.f), &resolved_hits);
   EXPECT_EQ(nullptr, resolved_hits.get());
 }
 
 }  // namespace test