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

Unified Diff: services/ui/ws/display_manager.cc

Issue 2356913002: Pass device scale factor from display to ws. (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: services/ui/ws/display_manager.cc
diff --git a/services/ui/ws/display_manager.cc b/services/ui/ws/display_manager.cc
index bcd520bd56c1749aa44a3cf33aa29fc8707a9d00..7cdb23c4e708a64a31d2478b8ca1a42a3a1490fc 100644
--- a/services/ui/ws/display_manager.cc
+++ b/services/ui/ws/display_manager.cc
@@ -166,10 +166,19 @@ void DisplayManager::OnActiveUserIdChanged(const UserId& previously_active_id,
current_window_manager_state->Activate(mouse_location_on_screen);
}
-void DisplayManager::OnDisplayAdded(int64_t id, const gfx::Rect& bounds) {
+void DisplayManager::OnDisplayAdded(int64_t id,
+ const gfx::Rect& bounds,
+ const gfx::Size& pixel_size,
+ float scale_factor) {
+ LOG(ERROR) << "DisplayManager::OnDisplayAdded"
+ << "\n id=" << id << "\n bounds=" << bounds.ToString()
+ << "\n pixel_size=" << pixel_size.ToString()
+ << "\n scale_factor=" << scale_factor;
PlatformDisplayInitParams params;
- params.display_bounds = bounds;
params.display_id = id;
+ params.metrics.bounds = bounds;
+ params.metrics.pixel_size = pixel_size;
+ params.metrics.device_scale_factor = scale_factor;
params.surfaces_state = window_server_->GetSurfacesState();
ws::Display* display = new ws::Display(window_server_, params);
@@ -184,7 +193,10 @@ void DisplayManager::OnDisplayRemoved(int64_t id) {
DestroyDisplay(display);
}
-void DisplayManager::OnDisplayModified(int64_t id, const gfx::Rect& bounds) {
+void DisplayManager::OnDisplayModified(int64_t id,
+ const gfx::Rect& bounds,
+ const gfx::Size& pixel_size,
+ float scale_factor) {
// TODO(kylechar): Implement.
NOTREACHED();
}

Powered by Google App Engine
This is Rietveld 408576698