WIP: Surface Synchronization System

services/ui/ws/window_finder_unittest.cc

 // Copyright 2015 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 "services/ui/ws/window_finder.h"
 
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 #include "services/ui/ws/window_finder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 namespace ws {
 
 TEST(WindowFinderTest, FindDeepestVisibleWindow) {
   TestServerWindowDelegate window_delegate;
   ServerWindow root(&window_delegate, WindowId(1, 2));
   window_delegate.set_root_window(&root);
   root.SetVisible(true);
-  root.SetBounds(gfx::Rect(0, 0, 100, 100));
+  root.SetBounds(gfx::Rect(0, 0, 100, 100), cc::LocalFrameId());
 
   ServerWindow child1(&window_delegate, WindowId(1, 3));
   root.Add(&child1);
   EnableHitTest(&child1);
   child1.SetVisible(true);
-  child1.SetBounds(gfx::Rect(10, 10, 20, 20));
+  child1.SetBounds(gfx::Rect(10, 10, 20, 20), cc::LocalFrameId());
 
   ServerWindow child2(&window_delegate, WindowId(1, 4));
   root.Add(&child2);
   EnableHitTest(&child2);
   child2.SetVisible(true);
-  child2.SetBounds(gfx::Rect(15, 15, 20, 20));
+  child2.SetBounds(gfx::Rect(15, 15, 20, 20), cc::LocalFrameId());
 
   gfx::Point local_point(16, 16);
   EXPECT_EQ(&child2, FindDeepestVisibleWindowForEvents(&root, &local_point));
   EXPECT_EQ(gfx::Point(1, 1), local_point);
 
   local_point.SetPoint(13, 14);
   EXPECT_EQ(&child1, FindDeepestVisibleWindowForEvents(&root, &local_point));
   EXPECT_EQ(gfx::Point(3, 4), local_point);
 
   local_point.SetPoint(13, 14);
   child1.set_can_accept_events(false);
   EXPECT_EQ(nullptr, FindDeepestVisibleWindowForEvents(&root, &local_point));
   EXPECT_EQ(gfx::Point(13, 14), local_point);
 
   child2.set_extended_hit_test_region(gfx::Insets(10, 10, 10, 10));
   local_point.SetPoint(13, 14);
   EXPECT_EQ(&child2, FindDeepestVisibleWindowForEvents(&root, &local_point));
   EXPECT_EQ(gfx::Point(-2, -1), local_point);
 }
 
 TEST(WindowFinderTest, FindDeepestVisibleWindowHitTestMask) {
   TestServerWindowDelegate window_delegate;
   ServerWindow root(&window_delegate, WindowId(1, 2));
   window_delegate.set_root_window(&root);
   EnableHitTest(&root);
   root.SetVisible(true);
-  root.SetBounds(gfx::Rect(0, 0, 100, 100));
+  root.SetBounds(gfx::Rect(0, 0, 100, 100), cc::LocalFrameId());
 
   ServerWindow child_with_mask(&window_delegate, WindowId(1, 4));
   root.Add(&child_with_mask);
   EnableHitTest(&child_with_mask);
   child_with_mask.SetVisible(true);
-  child_with_mask.SetBounds(gfx::Rect(10, 10, 20, 20));
+  child_with_mask.SetBounds(gfx::Rect(10, 10, 20, 20), cc::LocalFrameId());
   child_with_mask.SetHitTestMask(gfx::Rect(2, 2, 16, 16));
 
   // Test a point inside the window but outside the mask.
   gfx::Point point_outside_mask(11, 11);
   EXPECT_EQ(&root,
             FindDeepestVisibleWindowForEvents(&root, &point_outside_mask));
   EXPECT_EQ(gfx::Point(11, 11), point_outside_mask);
 
   // Test a point inside the window and inside the mask.
   gfx::Point point_inside_mask(15, 15);
   EXPECT_EQ(&child_with_mask,
             FindDeepestVisibleWindowForEvents(&root, &point_inside_mask));
   EXPECT_EQ(gfx::Point(5, 5), point_inside_mask);
 }
 
 TEST(WindowFinderTest, FindDeepestVisibleWindowForEventsOverNonTarget) {
   TestServerWindowDelegate window_delegate;
   ServerWindow root(&window_delegate, WindowId(1, 2));
   window_delegate.set_root_window(&root);
   root.SetVisible(true);
-  root.SetBounds(gfx::Rect(0, 0, 100, 100));
+  root.SetBounds(gfx::Rect(0, 0, 100, 100), cc::LocalFrameId());
 
   // Create two windows, |child1| and |child2|. The two overlap but |child2| is
   // not a valid event target.
   ServerWindow child1(&window_delegate, WindowId(1, 3));
   root.Add(&child1);
   EnableHitTest(&child1);
   child1.SetVisible(true);
-  child1.SetBounds(gfx::Rect(10, 10, 20, 20));
+  child1.SetBounds(gfx::Rect(10, 10, 20, 20), cc::LocalFrameId());
 
   ServerWindow child2(&window_delegate, WindowId(1, 4));
   root.Add(&child2);
   child2.SetVisible(true);
-  child2.SetBounds(gfx::Rect(15, 15, 20, 20));
+  child2.SetBounds(gfx::Rect(15, 15, 20, 20), cc::LocalFrameId());
 
   // |location_point| is over |child2| and |child1|, but as |child2| isn't a
   // valid event taret |child2| should be picked.
   gfx::Point local_point(16, 16);
   EXPECT_EQ(&child1, FindDeepestVisibleWindowForEvents(&root, &local_point));
   EXPECT_EQ(gfx::Point(6, 6), local_point);
 }
 
 }  // namespace ws
 }  // namespace ui