Add Vector2d classes that represent offsets, instead of using Point.

content/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include "base/string_number_conversions.h"
@@ skipping 772 matching lines @@
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::scrollToPoint(
     enum IA2CoordinateType coordinate_type,
     LONG x,
     LONG y) {
   if (!instance_active_)
     return E_FAIL;
 
+  gfx::Point scroll_to(x, y);
+
   if (coordinate_type == IA2_COORDTYPE_SCREEN_RELATIVE) {
-    gfx::Point top_left = manager_->GetViewBounds().origin();
-    x -= top_left.x();
-    y -= top_left.y();
+    scroll_to -= manager_->GetViewBounds().OffsetFromOrigin();
   } else if (coordinate_type == IA2_COORDTYPE_PARENT_RELATIVE) {

[Peter Kasting, 2012/10/30 01:14:14]

Nit: Can save one line by reversing this condition and returning, then combining
the subsequent "else" and "if (parent_)" into one "else if"

[danakj, 2012/10/30 19:21:21]

Idk, I find that version a lot harder to read and reason about, I don't think
it's worth saving a line.

-    if (parent_) {
-      gfx::Rect parent_bounds = parent_->location();
-      x += parent_bounds.x();
-      y += parent_bounds.y();
-    }
+    if (parent_)
+      scroll_to += parent_->location().OffsetFromOrigin();
   } else {
     return E_INVALIDARG;
   }
 
-  gfx::Rect r = location_;
-  manager_->ScrollToPoint(*this, gfx::Point(x, y));
+  manager_->ScrollToPoint(*this, scroll_to);
 
   static_cast<BrowserAccessibilityManagerWin*>(manager_)
       ->TrackScrollingObject(this);
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_groupPosition(
     LONG* group_level,
     LONG* similar_items_in_group,
@@ skipping 2696 matching lines @@
   // The role should always be set.
   DCHECK(!role_name_.empty() || ia_role_);
 
   // If we didn't explicitly set the IAccessible2 role, make it the same
   // as the MSAA role.
   if (!ia2_role_)
     ia2_role_ = ia_role_;
 }
 
 }  // namespace content