Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / aura / window.cc

diff --git a/src/ui/aura/window.cc b/src/ui/aura/window.cc
index fb25f62..4d9cec7 100644 (file)
--- a/src/ui/aura/window.cc
+++ b/src/ui/aura/window.cc
@@ -1312,7 +1312,9 @@ bool Window::NotifyWindowVisibilityChangedDown(aura::Window* target,
 
 void Window::NotifyWindowVisibilityChangedUp(aura::Window* target,
                                              bool visible) {
-  for (Window* window = this; window; window = window->parent()) {
+  // Start with the parent as we already notified |this|
+  // in NotifyWindowVisibilityChangedDown.
+  for (Window* window = parent(); window; window = window->parent()) {
     bool ret = window->NotifyWindowVisibilityChangedAtReceiver(target, visible);
     DCHECK(ret);
   }
@@ -1443,16 +1445,6 @@ void Window::UpdateLayerName() {
 #endif
 }
 
-bool Window::ContainsMouse() {
-  bool contains_mouse = false;
-  if (IsVisible()) {
-    WindowTreeHost* host = GetHost();
-    contains_mouse = host &&
-        ContainsPointInRoot(host->dispatcher()->GetLastMouseLocationInRoot());
-  }
-  return contains_mouse;
-}
-
 const Window* Window::GetAncestorWithLayer(gfx::Vector2d* offset) const {
   for (const aura::Window* window = this; window; window = window->parent()) {
     if (window->layer())