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

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

Issue 2961403002: WIP fix for Ozone cursor woes in Mushrome: Numéro deux
Patch Set: Created 3 years, 5 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/service.cc ('k') | services/ui/ws/platform_display.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 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/display.h" 5 #include "services/ui/ws/display.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 void Display::Init(const display::ViewportMetrics& metrics, 67 void Display::Init(const display::ViewportMetrics& metrics,
68 std::unique_ptr<DisplayBinding> binding) { 68 std::unique_ptr<DisplayBinding> binding) {
69 binding_ = std::move(binding); 69 binding_ = std::move(binding);
70 display_manager()->AddDisplay(this); 70 display_manager()->AddDisplay(this);
71 71
72 CreateRootWindow(metrics.bounds_in_pixels.size()); 72 CreateRootWindow(metrics.bounds_in_pixels.size());
73 73
74 platform_display_ = PlatformDisplay::Create( 74 platform_display_ = PlatformDisplay::Create(
75 root_.get(), metrics, window_server_->GetResourceRunner(), 75 root_.get(), metrics, window_server_->GetResourceRunner(),
76 window_server_->GetImageCursorsWeakPtr()); 76 window_server_->GetImageCursorsHolderWeakPtr());
77 platform_display_->Init(this); 77 platform_display_->Init(this);
78 } 78 }
79 79
80 int64_t Display::GetId() const { 80 int64_t Display::GetId() const {
81 // TODO(tonikitoo): Implement a different ID for external window mode. 81 // TODO(tonikitoo): Implement a different ID for external window mode.
82 return display_.id(); 82 return display_.id();
83 } 83 }
84 84
85 void Display::SetDisplay(const display::Display& display) { 85 void Display::SetDisplay(const display::Display& display) {
86 display_ = display; 86 display_ = display;
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 419
420 UserActivityMonitor* activity_monitor = 420 UserActivityMonitor* activity_monitor =
421 window_server_->GetUserActivityMonitorForUser( 421 window_server_->GetUserActivityMonitorForUser(
422 window_server_->user_id_tracker()->active_id()); 422 window_server_->user_id_tracker()->active_id());
423 activity_monitor->OnUserActivity(); 423 activity_monitor->OnUserActivity();
424 return EventDispatchDetails(); 424 return EventDispatchDetails();
425 } 425 }
426 426
427 } // namespace ws 427 } // namespace ws
428 } // namespace ui 428 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/service.cc ('k') | services/ui/ws/platform_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698