Update To 11.40.268.0

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

diff --git a/src/ui/aura/test/window_test_api.cc b/src/ui/aura/test/window_test_api.cc
index 0ea3e18..86b3370 100644 (file)
--- a/src/ui/aura/test/window_test_api.cc
+++ b/src/ui/aura/test/window_test_api.cc
@@ -5,6 +5,8 @@
 #include "ui/aura/test/window_test_api.h"
 
 #include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
 
 namespace aura {
 namespace test {
@@ -17,7 +19,12 @@ bool WindowTestApi::OwnsLayer() const {
 }
 
 bool WindowTestApi::ContainsMouse() const {
-  return window_->ContainsMouse();
+  if (!window_->IsVisible())
+    return false;
+  WindowTreeHost* host = window_->GetHost();
+  return host &&
+         window_->ContainsPointInRoot(
+             host->dispatcher()->GetLastMouseLocationInRoot());
 }
 
 }  // namespace test