Change all ConvertPointTo* methods to use gfx::Point instead of CPoint....

chrome/views/view.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/views/view.h"
 
 #include <algorithm>
 
 #ifndef NDEBUG
 #include <iostream>
@@ skipping 551 matching lines @@
     // Fall through to return value based on context menu controller.
   }
   // WARNING: we may have been deleted.
   return (context_menu_controller != NULL) || possible_drag;
 }
 
 void View::ProcessMouseReleased(const MouseEvent& e, bool canceled) {
   if (!canceled && context_menu_controller_ && e.IsOnlyRightMouseButton()) {
     // Assume that if there is a context menu controller we won't be deleted
     // from mouse released.
-    CPoint location(e.x(), e.y());
+    gfx::Point location(e.location());
     ConvertPointToScreen(this, &location);
     ContextMenuController* context_menu_controller = context_menu_controller_;
     OnMouseReleased(e, canceled);
-    context_menu_controller_->ShowContextMenu(this, location.x, location.y,
+    context_menu_controller_->ShowContextMenu(this, location.x(), location.y(),
                                               true);
   } else {
     OnMouseReleased(e, canceled);
   }
   // WARNING: we may have been deleted.
 }
 
 void View::DoDrag(const MouseEvent& e, int press_x, int press_y) {
   scoped_refptr<OSExchangeData> data = new OSExchangeData;
   WriteDragData(press_x, press_y, data.get());
@@ skipping 189 matching lines @@
 }
 
 View* View::GetViewForPoint(const CPoint& point, bool can_create_floating) {
   // Walk the child Views recursively looking for the View that most
   // tightly encloses the specified point.
   for (int i = GetChildViewCount() - 1 ; i >= 0 ; --i) {
     View* child = GetChildViewAt(i);
     if (!child->IsVisible())
       continue;
 
-    CPoint point_in_child_coords(point);
+    gfx::Point point_in_child_coords(point);
     View::ConvertPointToView(this, child, &point_in_child_coords);
-    if (child->HitTest(point_in_child_coords))
-      return child->GetViewForPoint(point_in_child_coords, true);
+    if (child->HitTest(point_in_child_coords.ToPOINT()))
+      return child->GetViewForPoint(point_in_child_coords.ToPOINT(), true);
   }
 
   // We haven't found a view for the point. Try to create floating views
   // and try again if one was created.
   // can_create_floating makes sure we don't try forever even if
   // GetFloatingViewIDForPoint lies or if RetrieveFloatingViewForID creates a
   // view which doesn't contain the provided point
   int id;
   if (can_create_floating && GetFloatingViewIDForPoint(point.x, point.y, &id)) {
     RetrieveFloatingViewForID(id);  // This creates the floating view.
@@ skipping 477 matching lines @@
         return true;
       }
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 // static
-void View::ConvertPointToView(View* src,
-                              View* dst,
-                              gfx::Point* point) {
+void View::ConvertPointToView(View* src, View* dst, gfx::Point* point) {
   ConvertPointToView(src, dst, point, true);
 }
 
 // static
-void View::ConvertPointToView(View* src,
-                              View* dst,
-                              CPoint* point) {
-  gfx::Point tmp_point(point->x, point->y);
-  ConvertPointToView(src, dst, &tmp_point, true);
-  point->x = tmp_point.x();
-  point->y = tmp_point.y();
-}
-
-// static
-void View::ConvertPointToView(View* src,
-                              View* dst,
-                              gfx::Point* point,
+void View::ConvertPointToView(View* src, View* dst, gfx::Point* point,
                               bool try_other_direction) {
   // src can be NULL
   DCHECK(dst);
   DCHECK(point);
 
   View* v;
   gfx::Point offset;
 
   for (v = dst; v && v != src; v = v->GetParent()) {
     offset.SetPoint(offset.x() + v->GetX(APPLY_MIRRORING_TRANSFORMATION),
@@ skipping 19 matching lines @@
       if (vc) {
         CRect b;
         vc->GetBounds(&b, false);
         point->SetPoint(point->x() - b.left, point->y() - b.top);
       }
     }
   }
 }
 
 // static
-void View::ConvertPointToViewContainer(View* src, CPoint* p) {
+void View::ConvertPointToViewContainer(View* src, gfx::Point* p) {
   DCHECK(src);
   DCHECK(p);
+
   View *v;
-  CPoint offset(0, 0);
-
+  gfx::Point offset;
   for (v = src; v; v = v->GetParent()) {
-    offset.x += v->GetX(APPLY_MIRRORING_TRANSFORMATION);
-    offset.y += v->y();
+    offset.set_x(offset.x() + v->GetX(APPLY_MIRRORING_TRANSFORMATION));
+    offset.set_y(offset.y() + v->y());
   }
-  p->x += offset.x;
-  p->y += offset.y;
+  p->SetPoint(p->x() + offset.x(), p->y() + offset.y());
 }
 
 // static
-void View::ConvertPointFromViewContainer(View *source, CPoint *p) {
-  CPoint t(0, 0);
+void View::ConvertPointFromViewContainer(View *source, gfx::Point* p) {
+  gfx::Point t;
   ConvertPointToViewContainer(source, &t);
-  p->x -= t.x;
-  p->y -= t.y;
+  p->SetPoint(p->x() - t.x(), p->y() - t.y());
 }
 
 // static
-void View::ConvertPointToScreen(View* src, CPoint* p) {
+void View::ConvertPointToScreen(View* src, gfx::Point* p) {
   DCHECK(src);
   DCHECK(p);
 
-  // If the view is not connected to a tree, do nothing
-  if (src->GetViewContainer() == NULL) {
-    return;
-  }
-
-  ConvertPointToViewContainer(src, p);
+  // If the view is not connected to a tree, there's nothing we can do.
   ViewContainer* vc = src->GetViewContainer();
   if (vc) {
+    ConvertPointToViewContainer(src, p);
     CRect r;
     vc->GetBounds(&r, false);
-    p->x += r.left;
-    p->y += r.top;
+    p->SetPoint(p->x() + r.left, p->y() + r.top);
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // View - event handlers
 //
 /////////////////////////////////////////////////////////////////////////////
 
 bool View::OnMousePressed(const MouseEvent& e) {
@@ skipping 308 matching lines @@
 }
 
 void View::DragInfo::PossibleDrag(int x, int y) {
   possible_drag = true;
   start_x = x;
   start_y = y;
 }
 
 }  // namespace