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

Side by Side Diff: ui/aura/window.cc

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/aura/window.h" 5 #include "ui/aura/window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 WindowObserver, observers_, OnWindowPaintScheduled(this, rect)); 313 WindowObserver, observers_, OnWindowPaintScheduled(this, rect));
314 } 314 }
315 } 315 }
316 316
317 void Window::SetExternalTexture(ui::Texture* texture) { 317 void Window::SetExternalTexture(ui::Texture* texture) {
318 layer_->SetExternalTexture(texture); 318 layer_->SetExternalTexture(texture);
319 } 319 }
320 320
321 void Window::SetDefaultParentByRootWindow(RootWindow* root_window, 321 void Window::SetDefaultParentByRootWindow(RootWindow* root_window,
322 const gfx::Rect& bounds_in_screen) { 322 const gfx::Rect& bounds_in_screen) {
323 DCHECK(root_window); 323 // TODO(erg): Enable this DCHECK once it is safe.
324 // DCHECK(root_window);
324 325
325 // Stacking clients are mandatory on RootWindow objects. 326 // Stacking clients are mandatory on RootWindow objects.
326 client::StackingClient* client = client::GetStackingClient(root_window); 327 client::StackingClient* client = client::GetStackingClient(root_window);
327 DCHECK(client); 328 DCHECK(client);
328 329
329 aura::Window* default_parent = client->GetDefaultParent( 330 aura::Window* default_parent = client->GetDefaultParent(
330 root_window, this, bounds_in_screen); 331 root_window, this, bounds_in_screen);
331 default_parent->AddChild(this); 332 default_parent->AddChild(this);
332 } 333 }
333 334
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 bool contains_mouse = false; 966 bool contains_mouse = false;
966 if (IsVisible()) { 967 if (IsVisible()) {
967 RootWindow* root_window = GetRootWindow(); 968 RootWindow* root_window = GetRootWindow();
968 contains_mouse = root_window && 969 contains_mouse = root_window &&
969 ContainsPointInRoot(root_window->GetLastMouseLocationInRoot()); 970 ContainsPointInRoot(root_window->GetLastMouseLocationInRoot());
970 } 971 }
971 return contains_mouse; 972 return contains_mouse;
972 } 973 }
973 974
974 } // namespace aura 975 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/test_stacking_client.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698