Revert 98850 - Proper MouseEvent targeting. Adds a Window method that locates a Window for a give...

aura/window.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef AURA_WINDOW_H_
 #define AURA_WINDOW_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
 
 namespace ui {
 class Compositor;
 class Layer;
 }
 
 namespace aura {
 
 class Desktop;
 class MouseEvent;
 class WindowDelegate;
 
 // Aura window implementation. Interesting events are sent to the
 // WindowDelegate.
-// TODO(beng): resolve ownership.
 class Window {
  public:
   enum Visibility {
     // Don't display the window onscreen and don't let it receive mouse
     // events. This is the default.
     VISIBILITY_HIDDEN = 1,
 
     // Display the window and let it receive mouse events.
     VISIBILITY_SHOWN = 2,
 
@@ skipping 33 matching lines @@
 
   // Draw the window and its children.
   void DrawTree();
 
   // Tree operations.
   // TODO(beng): Child windows are currently not owned by the hierarchy. We
   //             should change this.
   void AddChild(Window* child);
   void RemoveChild(Window* child);
 
-  static void ConvertPointToWindow(Window* source,
-                                   Window* target,
-                                   gfx::Point* point);
-
   // Handles a mouse event. Returns true if handled.
   bool OnMouseEvent(const MouseEvent& event);
 
-  WindowDelegate* delegate() { return delegate_; }
-
-  // Returns true if the mouse pointer at the specified |point| can trigger an
-  // event for this Window.
-  // TODO(beng):
-  // A Window can supply a hit-test mask to cause some portions of itself to not
-  // trigger events, causing the events to fall through to the Window behind.
-  bool HitTest(const gfx::Point& point);
-
-  // Returns the Window that most closely encloses |point| for the purposes of
-  // event targeting.
-  Window* GetEventHandlerForPoint(const gfx::Point& point);
-
  private:
   typedef std::vector<Window*> Windows;
 
   // If SchedulePaint has been invoked on the Window the delegate is notified.
   void UpdateLayerCanvas();
 
   // Draws the Window's contents.
   void Draw();
 
   WindowDelegate* delegate_;
@@ skipping 21 matching lines @@
   Windows children_;
 
   int id_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // AURA_WINDOW_H_