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

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

Issue 2651843002: FrameGenerator should receive SurfaceInfo and use it in frame generation (Closed)
Patch Set: c 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/display.h ('k') | services/ui/ws/frame_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/display.cc
diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
index eee8a6c7cdfd6c19a8b3eaa1fc69633ffd4fc498..e93c88023faa98ee3d0add72f88614e52ad67e22 100644
--- a/services/ui/ws/display.cc
+++ b/services/ui/ws/display.cc
@@ -270,13 +270,6 @@ ServerWindow* Display::GetRootWindow() {
return root_.get();
}
-ServerWindow* Display::GetActiveRootWindow() {
- WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
- if (display_root)
- return display_root->root();
- return nullptr;
-}
-
void Display::OnAcceleratedWidgetAvailable() {
display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
InitWindowManagerDisplayRoots();
@@ -313,6 +306,13 @@ void Display::OnViewportMetricsChanged(
pair.second->root()->SetBounds(new_bounds);
}
+ServerWindow* Display::GetActiveRootWindow() {
+ WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
+ if (display_root)
+ return display_root->root();
+ return nullptr;
+}
+
bool Display::CanHaveActiveChildren(ServerWindow* window) const {
return window && activation_parents_.Contains(window);
}
« no previous file with comments | « services/ui/ws/display.h ('k') | services/ui/ws/frame_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698