Chromium Code Reviews| Index: content/browser/accessibility/browser_accessibility_win.cc |
| diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc |
| index 5696ce2c27717a96ac4910dcdb31e4e3517067bd..71d89082c0e6535110a46f87ec41247db95adde7 100644 |
| --- a/content/browser/accessibility/browser_accessibility_win.cc |
| +++ b/content/browser/accessibility/browser_accessibility_win.cc |
| @@ -790,22 +790,18 @@ STDMETHODIMP BrowserAccessibilityWin::scrollToPoint( |
| 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
danakj
2012/10/30 19:21:21
Idk, I find that version a lot harder to read and
|
| - 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); |