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

Unified Diff: ui/aura/window_targeter.cc

Issue 167323004: events: Fix event-targeting for transformed windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nits Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: ui/aura/window_targeter.cc
diff --git a/ui/aura/window_targeter.cc b/ui/aura/window_targeter.cc
index 942d8c74dca5f54de808f15ee785cc923e5b8b53..7db90de14af1f06092ecd9eb1a984f34f5b1f638 100644
--- a/ui/aura/window_targeter.cc
+++ b/ui/aura/window_targeter.cc
@@ -37,10 +37,10 @@ bool WindowTargeter::WindowCanAcceptEvent(aura::Window* window,
bool WindowTargeter::EventLocationInsideBounds(
aura::Window* window, const ui::LocatedEvent& event) const {
- gfx::RectF bounds = window->bounds();
- if (window->layer())
- window->layer()->transform().TransformRect(&bounds);
- return bounds.Contains(event.location());
+ gfx::Point point = event.location();
+ if (window->parent())
+ aura::Window::ConvertPointToTarget(window->parent(), window, &point);
+ return gfx::Rect(window->bounds().size()).Contains(point);
}
ui::EventTarget* WindowTargeter::FindTargetForEvent(ui::EventTarget* root,

Powered by Google App Engine
This is Rietveld 408576698