Drop the retargeting of accNavigate in BrowserAccessibilityWin

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 <algorithm>
@@ skipping 473 matching lines @@
     return E_FAIL;
 
   return GetPlatformNodeWin()->accLocation(x_left, y_top, width, height,
                                            var_id);
 }
 
 STDMETHODIMP BrowserAccessibilityWin::accNavigate(LONG nav_dir,
                                                   VARIANT start,
                                                   VARIANT* end) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_NAVIGATE);
+
+  // Forward all directions but NAVDIR_ to the platform node implementation.
+  if (nav_dir != NAVDIR_DOWN && nav_dir != NAVDIR_UP &&
+      nav_dir != NAVDIR_LEFT && nav_dir != NAVDIR_RIGHT) {
+    return GetPlatformNodeWin()->accNavigate(nav_dir, start, end);
+  }
+
   BrowserAccessibilityWin* target = GetTargetFromChildID(start);
   if (!target)
     return E_INVALIDARG;
 
-  // Forward all directions but NAVDIR_ to the platform node implementation.
-  if (nav_dir != NAVDIR_DOWN && nav_dir != NAVDIR_UP &&
-      nav_dir != NAVDIR_LEFT && nav_dir != NAVDIR_RIGHT) {
-    return target->GetPlatformNodeWin()->accNavigate(nav_dir, start, end);
-  }
-
   BrowserAccessibility* result = nullptr;
   switch (nav_dir) {
     case NAVDIR_DOWN:
       result = target->GetTableCell(GetTableRow() + GetTableRowSpan(),
                                     GetTableColumn());
       break;
     case NAVDIR_UP:
       result = target->GetTableCell(GetTableRow() - 1, GetTableColumn());
       break;
     case NAVDIR_LEFT:
@@ skipping 5158 matching lines @@
   return static_cast<BrowserAccessibilityWin*>(obj);
 }
 
 const BrowserAccessibilityWin*
 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) {
   DCHECK(!obj || obj->IsNative());
   return static_cast<const BrowserAccessibilityWin*>(obj);
 }
 
 }  // namespace content