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/gpu_compositor_frame_sink.h" | |
|
rjkroege
2016/11/21 23:05:36
doesn't seem like anything else changed. do you ne
Fady Samuel
2016/11/22 01:02:23
No, I'm not sure how it got in here. Rebase error?
| |
| 8 #include "services/ui/ws/server_window.h" | 9 #include "services/ui/ws/server_window.h" |
| 9 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h" | 10 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h" |
| 10 #include "services/ui/ws/server_window_delegate.h" | 11 #include "services/ui/ws/server_window_delegate.h" |
| 11 #include "services/ui/ws/window_coordinate_conversions.h" | 12 #include "services/ui/ws/window_coordinate_conversions.h" |
| 12 #include "ui/gfx/geometry/point.h" | 13 #include "ui/gfx/geometry/point.h" |
| 13 #include "ui/gfx/geometry/point_f.h" | 14 #include "ui/gfx/geometry/point_f.h" |
| 14 #include "ui/gfx/transform.h" | 15 #include "ui/gfx/transform.h" |
| 15 | 16 |
| 16 namespace ui { | 17 namespace ui { |
| 17 namespace ws { | 18 namespace ws { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 ServerWindow* current = window; | 68 ServerWindow* current = window; |
| 68 while (current->parent()) { | 69 while (current->parent()) { |
| 69 transform.Translate(-current->bounds().x(), -current->bounds().y()); | 70 transform.Translate(-current->bounds().x(), -current->bounds().y()); |
| 70 current = current->parent(); | 71 current = current->parent(); |
| 71 } | 72 } |
| 72 return transform; | 73 return transform; |
| 73 } | 74 } |
| 74 | 75 |
| 75 } // namespace ws | 76 } // namespace ws |
| 76 } // namespace ui | 77 } // namespace ui |
| OLD | NEW |