Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "services/ui/ws/window_finder.h" | 5 #include "services/ui/ws/window_finder.h" |
| 6 | 6 |
| 7 #include "base/containers/adapters.h" | 7 #include "base/containers/adapters.h" |
| 8 #include "services/ui/surfaces/surfaces_state.h" | 8 #include "services/ui/surfaces/surfaces_state.h" |
| 9 #include "services/ui/ws/server_window.h" | 9 #include "services/ui/ws/server_window.h" |
| 10 #include "services/ui/ws/server_window_delegate.h" | 10 #include "services/ui/ws/server_window_delegate.h" |
| 11 #include "services/ui/ws/server_window_surface.h" | 11 #include "services/ui/ws/server_window_surface.h" |
| 12 #include "services/ui/ws/server_window_surface_manager.h" | 12 #include "services/ui/ws/server_window_surface_manager.h" |
| 13 #include "services/ui/ws/window_coordinate_conversions.h" | 13 #include "services/ui/ws/window_coordinate_conversions.h" |
| 14 #include "ui/gfx/geometry/point.h" | 14 #include "ui/gfx/geometry/point.h" |
| 15 #include "ui/gfx/geometry/point_f.h" | 15 #include "ui/gfx/geometry/point_f.h" |
| 16 #include "ui/gfx/transform.h" | 16 #include "ui/gfx/transform.h" |
| 17 | 17 |
| 18 namespace ui { | 18 namespace ui { |
| 19 namespace ws { | 19 namespace ws { |
| 20 | 20 |
| 21 bool IsValidWindowForEvents(ServerWindow* window) { | 21 bool IsValidWindowForEvents(ServerWindow* window) { |
| 22 ServerWindowSurfaceManager* surface_manager = window->surface_manager(); | 22 ServerWindowSurfaceManager* surface_manager = window->surface_manager(); |
| 23 return surface_manager && | 23 return surface_manager && |
| 24 surface_manager->HasSurfaceOfType(mojom::SurfaceType::DEFAULT); | 24 surface_manager->HasSurfaceOfType(mojom::SurfaceType::DEFAULT); |
| 25 } | 25 } |
| 26 | 26 |
| 27 ServerWindow* FindDeepestVisibleWindowForEvents(ServerWindow* window, | 27 ServerWindow* FindDeepestVisibleWindowForEvents(ServerWindow* window, |
| 28 gfx::Point* location) { | 28 gfx::Point* location) { |
|
sadrul
2016/07/12 17:32:33
return nullptr if (!window->can_accept_events())
riajiang
2016/07/12 18:46:40
Done.
| |
| 29 const ServerWindow::Windows& children = window->children(); | 29 const ServerWindow::Windows& children = window->children(); |
| 30 for (ServerWindow* child : base::Reversed(children)) { | 30 for (ServerWindow* child : base::Reversed(children)) { |
| 31 if (!child->visible()) | 31 if (!child->visible()) |
| 32 continue; | 32 continue; |
| 33 | 33 |
| 34 if (!child->can_accept_events()) | |
| 35 continue; | |
| 36 | |
| 34 // TODO(sky): support transform. | 37 // TODO(sky): support transform. |
| 35 gfx::Point child_location(location->x() - child->bounds().x(), | 38 gfx::Point child_location(location->x() - child->bounds().x(), |
| 36 location->y() - child->bounds().y()); | 39 location->y() - child->bounds().y()); |
| 37 gfx::Rect child_bounds(child->bounds().size()); | 40 gfx::Rect child_bounds(child->bounds().size()); |
| 38 child_bounds.Inset(-child->extended_hit_test_region().left(), | 41 child_bounds.Inset(-child->extended_hit_test_region().left(), |
| 39 -child->extended_hit_test_region().top(), | 42 -child->extended_hit_test_region().top(), |
| 40 -child->extended_hit_test_region().right(), | 43 -child->extended_hit_test_region().right(), |
| 41 -child->extended_hit_test_region().bottom()); | 44 -child->extended_hit_test_region().bottom()); |
| 42 if (!child_bounds.Contains(child_location)) | 45 if (!child_bounds.Contains(child_location)) |
| 43 continue; | 46 continue; |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 59 ServerWindow* current = window; | 62 ServerWindow* current = window; |
| 60 while (current->parent()) { | 63 while (current->parent()) { |
| 61 transform.Translate(-current->bounds().x(), -current->bounds().y()); | 64 transform.Translate(-current->bounds().x(), -current->bounds().y()); |
| 62 current = current->parent(); | 65 current = current->parent(); |
| 63 } | 66 } |
| 64 return transform; | 67 return transform; |
| 65 } | 68 } |
| 66 | 69 |
| 67 } // namespace ws | 70 } // namespace ws |
| 68 } // namespace ui | 71 } // namespace ui |
| OLD | NEW |