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

Side by Side Diff: services/ui/ws/window_server.h

Issue 2541683004: Add/remove surface references via MojoCompositorFrameSink. (Closed)
Patch Set: Cleanup. Created 4 years 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/test_server_window_delegate.cc ('k') | services/ui/ws/window_server.cc » ('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 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 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_ 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_
6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 ServerWindow* GetCurrentDragLoopWindow(); 221 ServerWindow* GetCurrentDragLoopWindow();
222 WindowTree* GetCurrentDragLoopInitiator(); 222 WindowTree* GetCurrentDragLoopInitiator();
223 bool in_drag_loop() const { return !!current_drag_loop_; } 223 bool in_drag_loop() const { return !!current_drag_loop_; }
224 224
225 void OnDisplayReady(Display* display, bool is_first); 225 void OnDisplayReady(Display* display, bool is_first);
226 void OnNoMoreDisplays(); 226 void OnNoMoreDisplays();
227 WindowManagerState* GetWindowManagerStateForUser(const UserId& user_id); 227 WindowManagerState* GetWindowManagerStateForUser(const UserId& user_id);
228 228
229 // ServerWindowDelegate: 229 // ServerWindowDelegate:
230 cc::mojom::DisplayCompositor* GetDisplayCompositor() override; 230 cc::mojom::DisplayCompositor* GetDisplayCompositor() override;
231 const cc::SurfaceId& GetRootSurfaceId() const override;
231 232
232 // UserDisplayManagerDelegate: 233 // UserDisplayManagerDelegate:
233 bool GetFrameDecorationsForUser( 234 bool GetFrameDecorationsForUser(
234 const UserId& user_id, 235 const UserId& user_id,
235 mojom::FrameDecorationValuesPtr* values) override; 236 mojom::FrameDecorationValuesPtr* values) override;
236 237
237 private: 238 private:
238 struct CurrentMoveLoopState; 239 struct CurrentMoveLoopState;
239 struct CurrentDragLoopState; 240 struct CurrentDragLoopState;
240 friend class Operation; 241 friend class Operation;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 void OnTransientWindowRemoved(ServerWindow* window, 324 void OnTransientWindowRemoved(ServerWindow* window,
324 ServerWindow* transient_child) override; 325 ServerWindow* transient_child) override;
325 326
326 // GpuServiceProxyDelegate: 327 // GpuServiceProxyDelegate:
327 void OnGpuServiceInitialized() override; 328 void OnGpuServiceInitialized() override;
328 329
329 // cc::mojom::DisplayCompositorClient: 330 // cc::mojom::DisplayCompositorClient:
330 void OnSurfaceCreated(const cc::SurfaceId& surface_id, 331 void OnSurfaceCreated(const cc::SurfaceId& surface_id,
331 const gfx::Size& frame_size, 332 const gfx::Size& frame_size,
332 float device_scale_factor) override; 333 float device_scale_factor) override;
334 void OnDisplayCompositorCreated(
335 const cc::SurfaceId& root_surface_id) override;
333 336
334 // UserIdTrackerObserver: 337 // UserIdTrackerObserver:
335 void OnActiveUserIdChanged(const UserId& previously_active_id, 338 void OnActiveUserIdChanged(const UserId& previously_active_id,
336 const UserId& active_id) override; 339 const UserId& active_id) override;
337 void OnUserIdAdded(const UserId& id) override; 340 void OnUserIdAdded(const UserId& id) override;
338 void OnUserIdRemoved(const UserId& id) override; 341 void OnUserIdRemoved(const UserId& id) override;
339 342
340 UserIdTracker user_id_tracker_; 343 UserIdTracker user_id_tracker_;
341 344
342 WindowServerDelegate* delegate_; 345 WindowServerDelegate* delegate_;
(...skipping 23 matching lines...) Expand all
366 // Next id supplied to the window manager. 369 // Next id supplied to the window manager.
367 uint32_t next_wm_change_id_; 370 uint32_t next_wm_change_id_;
368 371
369 std::unique_ptr<GpuServiceProxy> gpu_proxy_; 372 std::unique_ptr<GpuServiceProxy> gpu_proxy_;
370 base::Callback<void(ServerWindow*)> window_paint_callback_; 373 base::Callback<void(ServerWindow*)> window_paint_callback_;
371 374
372 UserActivityMonitorMap activity_monitor_map_; 375 UserActivityMonitorMap activity_monitor_map_;
373 376
374 WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_; 377 WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_;
375 378
379 cc::SurfaceId root_surface_id_;
380
376 mojo::Binding<cc::mojom::DisplayCompositorClient> 381 mojo::Binding<cc::mojom::DisplayCompositorClient>
377 display_compositor_client_binding_; 382 display_compositor_client_binding_;
378 // State for rendering into a Surface. 383 // State for rendering into a Surface.
379 cc::mojom::DisplayCompositorPtr display_compositor_; 384 cc::mojom::DisplayCompositorPtr display_compositor_;
380 385
381 DISALLOW_COPY_AND_ASSIGN(WindowServer); 386 DISALLOW_COPY_AND_ASSIGN(WindowServer);
382 }; 387 };
383 388
384 } // namespace ws 389 } // namespace ws
385 } // namespace ui 390 } // namespace ui
386 391
387 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ 392 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_
OLDNEW
« no previous file with comments | « services/ui/ws/test_server_window_delegate.cc ('k') | services/ui/ws/window_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698