Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: services/ui/ws/window_server_test_impl.cc

Issue 2617403003: Mus: Remove CompositorFrameSinkType (Closed)
Patch Set: Fix some unit tests Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/ui/ws/window_server.cc ('k') | services/ui/ws/window_tree.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_server_test_impl.h" 5 #include "services/ui/ws/window_server_test_impl.h"
6 6
7 #include "services/ui/public/interfaces/window_tree.mojom.h" 7 #include "services/ui/public/interfaces/window_tree.mojom.h"
8 #include "services/ui/ws/server_window.h" 8 #include "services/ui/ws/server_window.h"
9 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h" 9 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
10 #include "services/ui/ws/window_server.h" 10 #include "services/ui/ws/window_server.h"
11 #include "services/ui/ws/window_tree.h" 11 #include "services/ui/ws/window_tree.h"
12 12
13 namespace ui { 13 namespace ui {
14 namespace ws { 14 namespace ws {
15 15
16 namespace { 16 namespace {
17 17
18 bool WindowHasValidFrame(const ServerWindow* window) { 18 bool WindowHasValidFrame(const ServerWindow* window) {
19 const ServerWindowCompositorFrameSinkManager* manager = 19 const ServerWindowCompositorFrameSinkManager* manager =
20 window->compositor_frame_sink_manager(); 20 window->compositor_frame_sink_manager();
21 return manager && 21 return manager && !manager->GetLatestFrameSize().IsEmpty();
22 !manager->GetLatestFrameSize(mojom::CompositorFrameSinkType::DEFAULT)
23 .IsEmpty();
24 } 22 }
25 23
26 } // namespace 24 } // namespace
27 25
28 WindowServerTestImpl::WindowServerTestImpl(WindowServer* window_server) 26 WindowServerTestImpl::WindowServerTestImpl(WindowServer* window_server)
29 : window_server_(window_server) {} 27 : window_server_(window_server) {}
30 28
31 WindowServerTestImpl::~WindowServerTestImpl() {} 29 WindowServerTestImpl::~WindowServerTestImpl() {}
32 30
33 void WindowServerTestImpl::OnWindowPaint( 31 void WindowServerTestImpl::OnWindowPaint(
(...skipping 22 matching lines...) Expand all
56 } 54 }
57 } 55 }
58 56
59 window_server_->SetPaintCallback( 57 window_server_->SetPaintCallback(
60 base::Bind(&WindowServerTestImpl::OnWindowPaint, base::Unretained(this), 58 base::Bind(&WindowServerTestImpl::OnWindowPaint, base::Unretained(this),
61 client_name, std::move(callback))); 59 client_name, std::move(callback)));
62 } 60 }
63 61
64 } // namespace ws 62 } // namespace ws
65 } // namespace ui 63 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_server.cc ('k') | services/ui/ws/window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698