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

Side by Side Diff: mash/wm/window_manager.cc

Issue 1837093003: NOSUBMIT: Demonstrate accelerated layer painting problem in mus/mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « components/mus/public/cpp/lib/window.cc ('k') | ui/views/bubble/bubble_delegate.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 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 "mash/wm/window_manager.h" 5 #include "mash/wm/window_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "components/mus/common/types.h" 10 #include "components/mus/common/types.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 if (provide_non_client_frame) 105 if (provide_non_client_frame)
106 (*properties)[mus::mojom::kWaitForUnderlay_Property].clear(); 106 (*properties)[mus::mojom::kWaitForUnderlay_Property].clear();
107 107
108 // TODO(sky): constrain and validate properties before passing to server. 108 // TODO(sky): constrain and validate properties before passing to server.
109 mus::Window* window = root->connection()->NewWindow(properties); 109 mus::Window* window = root->connection()->NewWindow(properties);
110 window->SetBounds(CalculateDefaultBounds(window)); 110 window->SetBounds(CalculateDefaultBounds(window));
111 111
112 mojom::Container container = GetRequestedContainer(window); 112 mojom::Container container = GetRequestedContainer(window);
113 root_controller_->GetWindowForContainer(container)->AddChild(window); 113 root_controller_->GetWindowForContainer(container)->AddChild(window);
114 114
115 LOG(ERROR) << "JAMES NewTopLevelWindow mus bounds " << window->bounds().ToStri ng()
116 << " container " << container;
117
115 if (provide_non_client_frame) { 118 if (provide_non_client_frame) {
116 // NonClientFrameController deletes itself when |window| is destroyed. 119 // NonClientFrameController deletes itself when |window| is destroyed.
117 new NonClientFrameController(root_controller_->GetConnector(), window, 120 new NonClientFrameController(root_controller_->GetConnector(), window,
118 root_controller_->window_manager_client()); 121 root_controller_->window_manager_client());
119 } 122 }
120 123
121 root_controller_->IncrementWindowCount(); 124 root_controller_->IncrementWindowCount();
122 125
123 return window; 126 return window;
124 } 127 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 171
169 void WindowManager::ScreenlockStateChanged(bool locked) { 172 void WindowManager::ScreenlockStateChanged(bool locked) {
170 // Hide USER_PRIVATE windows when the screen is locked. 173 // Hide USER_PRIVATE windows when the screen is locked.
171 mus::Window* window = root_controller_->GetWindowForContainer( 174 mus::Window* window = root_controller_->GetWindowForContainer(
172 mash::wm::mojom::Container::USER_PRIVATE); 175 mash::wm::mojom::Container::USER_PRIVATE);
173 window->SetVisible(!locked); 176 window->SetVisible(!locked);
174 } 177 }
175 178
176 } // namespace wm 179 } // namespace wm
177 } // namespace mash 180 } // namespace mash
OLDNEW
« no previous file with comments | « components/mus/public/cpp/lib/window.cc ('k') | ui/views/bubble/bubble_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698