Adds propagation and handling of render-side focus events, for the benefit of...

chrome/browser/renderer_host/render_widget_host_view_win.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/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/rect.h"
 #include "base/histogram.h"
 #include "base/win_util.h"
-#include "chrome/browser/browser_accessibility.h"
 #include "chrome/browser/browser_accessibility_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/renderer_host/backing_store.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/native_web_keyboard_event.h"
@@ skipping 651 matching lines @@
     // will get a change to override the default handling
     SendMessage(WM_CANCELMODE);
   }
 }
 
 void RenderWidgetHostViewWin::OnDestroy() {
   ResetTooltip();
   TrackMouseLeave(false);
 #ifdef ENABLE_TRACK_HWND_DESTRUCTION
   TRACK_HWND_DESTRUCTION(m_hWnd);
-#endif //  ENABLE_TRACK_HWND_DESTRUCTION
+#endif  // ENABLE_TRACK_HWND_DESTRUCTION
 }
 
 void RenderWidgetHostViewWin::OnPaint(HDC dc) {
   DCHECK(render_widget_host_->process()->channel());
 
   about_to_validate_and_paint_ = true;
   BackingStore* backing_store = render_widget_host_->GetBackingStore();
 
   // We initialize |paint_dc| (and thus call BeginPaint()) after calling
   // GetBackingStore(), so that if it updates the invalid rect we'll catch the
@@ skipping 488 matching lines @@
   // TODO(jcampan): http://b/issue?id=1432077 Disabling accessibility in the
   // renderer is a temporary work-around until that bug is fixed.
   if (!renderer_accessible_)
     return reference_result;
 
   // Accessibility readers will send an OBJID_CLIENT message.
   if (OBJID_CLIENT == lparam) {
     // If our MSAA DOM root is already created, reuse that pointer. Otherwise,
     // create a new one.
     if (!browser_accessibility_root_) {
-      CComObject<BrowserAccessibility>* accessibility = NULL;
-
-      if (!SUCCEEDED(CComObject<BrowserAccessibility>::CreateInstance(
-              &accessibility)) || !accessibility) {
-        // Return with failure.
-        return static_cast<LRESULT>(0L);
-      }
-
-      CComPtr<IAccessible> accessibility_comptr(accessibility);
-
-      // Root id is always 0, to distinguish this particular instance when
-      // mapping to the render-side IAccessible.
-      accessibility->set_iaccessible_id(0);
-
-      // Set the unique member variables of this particular process.
-      accessibility->set_instance_id(
-          BrowserAccessibilityManager::GetInstance()->
-              SetMembers(accessibility, m_hWnd, render_widget_host_));
-
-      // All is well, assign the temp instance to the class smart pointer.
-      browser_accessibility_root_.Attach(accessibility_comptr.Detach());
+      // Create a new instance of IAccessible. Root id is always 0.
+      BrowserAccessibilityManager::GetInstance()->
+          CreateAccessibilityInstance(IID_IAccessible, 0,
+                                      render_widget_host_->routing_id(),
+                                      render_widget_host_->process()->pid(),
+                                      m_hWnd, reinterpret_cast<void **>
+                                          (&browser_accessibility_root_));
 
       if (!browser_accessibility_root_) {
-        // Paranoia check. Return with failure.
+        // No valid root found, return with failure.
         NOTREACHED();
         return static_cast<LRESULT>(0L);
       }
-
-      // Notify that an instance of IAccessible was allocated for m_hWnd.
-      ::NotifyWinEvent(EVENT_OBJECT_CREATE, m_hWnd, OBJID_CLIENT,
-                       CHILDID_SELF);
     }
 
-    // Create a reference to ViewAccessibility that MSAA will marshall
-    // to the client.
+    // Create a reference to BrowserAccessibility which MSAA will marshall to
+    // the client.
     reference_result = LresultFromObject(IID_IAccessible, wparam,
         static_cast<IAccessible*>(browser_accessibility_root_));
   }
   return reference_result;
 }
 
 void RenderWidgetHostViewWin::OnFinalMessage(HWND window) {
   render_widget_host_->ViewDestroyed();
   delete this;
 }
@@ skipping 77 matching lines @@
     // WM_LBUTTONDOWN.
     SetFocus();
   }
 }
 
 void RenderWidgetHostViewWin::ShutdownHost() {
   shutdown_factory_.RevokeAll();
   render_widget_host_->Shutdown();
   // Do not touch any members at this point, |this| has been deleted.
 }