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

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

Issue 2580063002: Mustash: Ensure surfaces submitted to Mus by WM and embedders contain Surfaces with embeded content. (Closed)
Patch Set: Make the clipping layer ui::LAYER_NOT_DRAWN. Created 3 years, 12 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
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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 } 263 }
264 264
265 display::Display Display::GetDisplay() { 265 display::Display Display::GetDisplay() {
266 return ToDisplay(); 266 return ToDisplay();
267 } 267 }
268 268
269 ServerWindow* Display::GetRootWindow() { 269 ServerWindow* Display::GetRootWindow() {
270 return root_.get(); 270 return root_.get();
271 } 271 }
272 272
273 ServerWindow* Display::GetActiveRootWindow() {
274 WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
275 if (display_root)
276 return display_root->root();
277 return nullptr;
278 }
279
273 void Display::OnAcceleratedWidgetAvailable() { 280 void Display::OnAcceleratedWidgetAvailable() {
274 display_manager()->OnDisplayAcceleratedWidgetAvailable(this); 281 display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
275 InitWindowManagerDisplayRoots(); 282 InitWindowManagerDisplayRoots();
276 } 283 }
277 284
278 bool Display::IsInHighContrastMode() { 285 bool Display::IsInHighContrastMode() {
279 return window_server_->IsActiveUserInHighContrastMode(); 286 return window_server_->IsActiveUserInHighContrastMode();
280 } 287 }
281 288
282 void Display::OnEvent(const ui::Event& event) { 289 void Display::OnEvent(const ui::Event& event) {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } 391 }
385 392
386 void Display::OnWindowManagerWindowTreeFactoryReady( 393 void Display::OnWindowManagerWindowTreeFactoryReady(
387 WindowManagerWindowTreeFactory* factory) { 394 WindowManagerWindowTreeFactory* factory) {
388 if (!binding_) 395 if (!binding_)
389 CreateWindowManagerDisplayRootFromFactory(factory); 396 CreateWindowManagerDisplayRootFromFactory(factory);
390 } 397 }
391 398
392 } // namespace ws 399 } // namespace ws
393 } // namespace ui 400 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698