Revert 135020 - Add initial GTK web accessibility framework.

content/browser/renderer_host/render_widget_host_view_gtk.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/renderer_host/render_widget_host_view_gtk.h"
 
 // If this gets included after the gtk headers, then a bunch of compiler
 // errors happen because of a "#define Status int" in Xlib.h, which interacts
 // badly with net::URLRequestStatus::Status.
 #include "content/common/view_messages.h"
 
 #include <cairo/cairo.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_offset_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/accessibility/browser_accessibility_gtk.h"
 #include "content/browser/renderer_host/backing_store_gtk.h"
 #include "content/browser/renderer_host/gtk_im_context_wrapper.h"
 #include "content/browser/renderer_host/gtk_key_bindings_handler.h"
 #include "content/browser/renderer_host/gtk_window_utils.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
@@ skipping 64 matching lines @@
 using content::RenderWidgetHostImpl;
 using content::RenderWidgetHostView;
 using content::RenderWidgetHostViewPort;
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseWheelEvent;
 
 // This class is a simple convenience wrapper for Gtk functions. It has only
 // static methods.
 class RenderWidgetHostViewGtkWidget {
  public:
-  static AtkObject* GetAccessible(void* userdata) {
-    return (static_cast<RenderWidgetHostViewGtk*>(userdata))->
-        GetAccessible();
-  }
-
   static GtkWidget* CreateNewWidget(RenderWidgetHostViewGtk* host_view) {
     GtkWidget* widget = gtk_preserve_window_new();
     gtk_widget_set_name(widget, "chrome-render-widget-host-view");
     // We manually double-buffer in Paint() because Paint() may or may not be
     // called in repsonse to an "expose-event" signal.
     gtk_widget_set_double_buffered(widget, FALSE);
     gtk_widget_set_redraw_on_allocate(widget, FALSE);
     gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &kBGColor);
     // Allow the browser window to be resized freely.
     gtk_widget_set_size_request(widget, 0, 0);
@@ skipping 38 matching lines @@
                      G_CALLBACK(OnCrossingEvent), host_view);
     g_signal_connect(widget, "client-event",
                      G_CALLBACK(OnClientEvent), host_view);
 
 
     // Connect after so that we are called after the handler installed by the
     // WebContentsView which handles zoom events.
     g_signal_connect_after(widget, "scroll-event",
                            G_CALLBACK(OnMouseScrollEvent), host_view);
 
-    // Route calls to get_accessible to the view.
-    gtk_preserve_window_set_accessible_factory(
-        GTK_PRESERVE_WINDOW(widget), GetAccessible, host_view);
-
     return widget;
   }
 
  private:
   static gboolean OnExposeEvent(GtkWidget* widget,
                                 GdkEventExpose* expose,
                                 RenderWidgetHostViewGtk* host_view) {
     if (host_view->is_hidden_)
       return FALSE;
     const gfx::Rect damage_rect(expose->area);
@@ skipping 1215 matching lines @@
   return new RenderWidgetHostViewGtk(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   GdkWindow* gdk_window =
       gdk_display_get_default_group(gdk_display_get_default());
   content::GetScreenInfoFromNativeWindow(gdk_window, results);
 }
-
-void RenderWidgetHostViewGtk::SetAccessibilityFocus(int acc_obj_id) {
-  if (!host_)
-    return;
-
-  host_->AccessibilitySetFocus(acc_obj_id);
-}
-
-void RenderWidgetHostViewGtk::AccessibilityDoDefaultAction(int acc_obj_id) {
-  if (!host_)
-    return;
-
-  host_->AccessibilityDoDefaultAction(acc_obj_id);
-}
-
-void RenderWidgetHostViewGtk::AccessibilityScrollToMakeVisible(
-    int acc_obj_id, gfx::Rect subfocus) {
-  if (!host_)
-    return;
-
-  host_->AccessibilityScrollToMakeVisible(acc_obj_id, subfocus);
-}
-
-void RenderWidgetHostViewGtk::AccessibilityScrollToPoint(
-    int acc_obj_id, gfx::Point point) {
-  if (!host_)
-    return;
-
-  host_->AccessibilityScrollToPoint(acc_obj_id, point);
-}
-
-void RenderWidgetHostViewGtk::AccessibilitySetTextSelection(
-    int acc_obj_id, int start_offset, int end_offset) {
-  if (!host_)
-    return;
-
-  host_->AccessibilitySetTextSelection(acc_obj_id, start_offset, end_offset);
-}
-
-void RenderWidgetHostViewGtk::OnAccessibilityNotifications(
-    const std::vector<AccessibilityHostMsg_NotificationParams>& params) {
-  if (!browser_accessibility_manager_.get()) {
-    GtkWidget* parent = gtk_widget_get_parent(view_.get());
-    browser_accessibility_manager_.reset(
-        BrowserAccessibilityManager::CreateEmptyDocument(
-            parent, static_cast<WebAccessibility::State>(0), this));
-  }
-  browser_accessibility_manager_->OnAccessibilityNotifications(params);
-}
-
-AtkObject* RenderWidgetHostViewGtk::GetAccessible() {
-  RenderWidgetHostImpl::From(GetRenderWidgetHost())->
-      SetAccessibilityMode(AccessibilityModeComplete);
-
-  if (!browser_accessibility_manager_.get()) {
-    GtkWidget* parent = gtk_widget_get_parent(view_.get());
-    browser_accessibility_manager_.reset(
-        BrowserAccessibilityManager::CreateEmptyDocument(
-            parent, static_cast<WebAccessibility::State>(0), this));
-  }
-  BrowserAccessibilityGtk* root =
-      browser_accessibility_manager_->GetRoot()->ToBrowserAccessibilityGtk();
-
-  atk_object_set_role(root->GetAtkObject(), ATK_ROLE_HTML_CONTAINER);
-  return root->GetAtkObject();
-}