Linux: move X operations from the IO to UI2 thread.

webkit/tools/test_shell/webwidget_host_gtk.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 "webkit/tools/test_shell/webwidget_host.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "skia/ext/bitmap_platform_device_linux.h"
 #include "skia/ext/platform_canvas_linux.h"
 #include "skia/ext/platform_device_linux.h"
 #include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h"
-#include "third_party/WebKit/WebKit/chromium/public/gtk/WebScreenInfoFactory.h"
+#include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "webkit/glue/webwidget.h"
 #include "webkit/tools/test_shell/test_shell.h"
+#include "webkit/tools/test_shell/test_shell_x11.h"
 
 using WebKit::WebInputEventFactory;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 using WebKit::WebScreenInfo;
 using WebKit::WebScreenInfoFactory;
 using WebKit::WebSize;
 
 namespace {
@@ skipping 329 matching lines @@
       static_cast<skia::BitmapPlatformDeviceLinux* >(&platdev);
   cairo_t* cairo_drawable = gdk_cairo_create(window);
   cairo_set_source_surface(cairo_drawable, bitdev->surface(), 0, 0);
   cairo_paint(cairo_drawable);
   cairo_destroy(cairo_drawable);
 
   gdk_window_end_paint(window);
 }
 
 WebScreenInfo WebWidgetHost::GetScreenInfo() {
-  return WebScreenInfoFactory::screenInfo(view_);
+  Display* display = test_shell_x11::GtkWidgetGetDisplay(view_);
+  int screen_num = test_shell_x11::GtkWidgetGetScreenNum(view_);
+  return WebScreenInfoFactory::screenInfo(display, screen_num);
 }
 
 void WebWidgetHost::ResetScrollRect() {
   // This method is only needed for optimized scroll painting, which we don't
   // care about in the test shell, yet.
 }
 
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
   set_painting(true);
   webwidget_->Paint(canvas_.get(), rect);
   set_painting(false);
 }
 
 void WebWidgetHost::WindowDestroyed() {
   delete this;
 }