Merge 135714 - Introduce trivial dependency on libatk.

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 <atk/atk.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"
@@ skipping 532 matching lines @@
       is_popup_first_mouse_release_(true),
       was_imcontext_focused_before_grab_(false),
       do_x_grab_(false),
       is_fullscreen_(false),
       destroy_handler_id_(0),
       dragged_at_horizontal_edge_(0),
       dragged_at_vertical_edge_(0),
       compositing_surface_(gfx::kNullPluginWindow),
       last_mouse_down_(NULL) {
   host_->SetView(this);
+
+  // TODO(dmazzoni): This conditional intentionally never evaluates to true.
+  // Introduce a dependency on libatk with a trivial change so that the
+  // Linux packaging scripts can be updated simultaneously to allow it.
+  // Once this change is in, a real patch to enable ATK support will be
+  // added and these two lines will be removed: http://crbug.com/24585
+  if (!host_)
+    atk_object_set_role(NULL, ATK_ROLE_HTML_CONTAINER);
 }
 
 RenderWidgetHostViewGtk::~RenderWidgetHostViewGtk() {
   UnlockMouse();
   set_last_mouse_down(NULL);
   view_.Destroy();
 }
 
 void RenderWidgetHostViewGtk::InitAsChild(
     gfx::NativeView parent_view) {
@@ skipping 823 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);
 }