Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/server_window.h" | 5 #include "services/ui/ws/server_window.h" |
| 6 | 6 |
| 7 #include <inttypes.h> | 7 #include <inttypes.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 observers_.RemoveObserver(observer); | 79 observers_.RemoveObserver(observer); |
| 80 } | 80 } |
| 81 | 81 |
| 82 bool ServerWindow::HasObserver(ServerWindowObserver* observer) { | 82 bool ServerWindow::HasObserver(ServerWindowObserver* observer) { |
| 83 return observers_.HasObserver(observer); | 83 return observers_.HasObserver(observer); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void ServerWindow::CreateDisplayCompositorFrameSink( | 86 void ServerWindow::CreateDisplayCompositorFrameSink( |
| 87 gfx::AcceleratedWidget widget, | 87 gfx::AcceleratedWidget widget, |
| 88 cc::mojom::MojoCompositorFrameSinkRequest request, | 88 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 89 cc::mojom::MojoCompositorFrameSinkClientPtr client) { | 89 cc::mojom::MojoCompositorFrameSinkClientPtr client, |
| 90 cc::mojom::DisplayPrivatePtr display_private, | |
| 91 cc::mojom::DisplayPrivateRequest display_request) { | |
| 90 GetOrCreateCompositorFrameSinkManager()->CreateDisplayCompositorFrameSink( | 92 GetOrCreateCompositorFrameSinkManager()->CreateDisplayCompositorFrameSink( |
| 91 widget, std::move(request), std::move(client)); | 93 widget, std::move(request), std::move(client), std::move(display_private), |
|
Fady Samuel
2016/12/16 05:29:39
I don't think you should be passing in the interfa
Alex Z.
2016/12/16 16:42:00
Done.
| |
| 94 std::move(display_request)); | |
|
Fady Samuel
2016/12/16 05:29:39
nit: display_private_request
Alex Z.
2016/12/16 16:42:00
Done.
| |
| 92 } | 95 } |
| 93 | 96 |
| 94 void ServerWindow::CreateOffscreenCompositorFrameSink( | 97 void ServerWindow::CreateOffscreenCompositorFrameSink( |
| 95 mojom::CompositorFrameSinkType compositor_frame_sink_type, | 98 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
| 96 cc::mojom::MojoCompositorFrameSinkRequest request, | 99 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 97 cc::mojom::MojoCompositorFrameSinkClientPtr client) { | 100 cc::mojom::MojoCompositorFrameSinkClientPtr client) { |
| 98 GetOrCreateCompositorFrameSinkManager()->CreateOffscreenCompositorFrameSink( | 101 GetOrCreateCompositorFrameSinkManager()->CreateOffscreenCompositorFrameSink( |
| 99 compositor_frame_sink_type, std::move(request), std::move(client)); | 102 compositor_frame_sink_type, std::move(request), std::move(client)); |
| 100 } | 103 } |
| 101 | 104 |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 462 } | 465 } |
| 463 | 466 |
| 464 // static | 467 // static |
| 465 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { | 468 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { |
| 466 return &window->stacking_target_; | 469 return &window->stacking_target_; |
| 467 } | 470 } |
| 468 | 471 |
| 469 } // namespace ws | 472 } // namespace ws |
| 470 | 473 |
| 471 } // namespace ui | 474 } // namespace ui |
| OLD | NEW |