Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h

content/plugin/webplugin_proxy.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/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 57 matching lines @@
       host_render_view_routing_id_(host_render_view_routing_id),
       weak_factory_(this) {
 #if defined(USE_X11)
   windowless_shm_pixmaps_[0] = None;
   windowless_shm_pixmaps_[1] = None;
   use_shm_pixmap_ = false;
 
   // If the X server supports SHM pixmaps
   // and the color depth and masks match,
   // then consider using SHM pixmaps for windowless plugin painting.
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   if (ui::QuerySharedMemorySupport(display) == ui::SHARED_MEMORY_PIXMAP &&
       ui::BitsPerPixelForPixmapDepth(
           display, DefaultDepth(display, DefaultScreen(display))) == 32) {
     Visual* vis = DefaultVisual(display, DefaultScreen(display));
 
     if (vis->red_mask == 0xff0000 &&
         vis->green_mask == 0xff00 &&
         vis->blue_mask == 0xff)
       use_shm_pixmap_ = true;
   }
 #endif
 }
 
 WebPluginProxy::~WebPluginProxy() {
 #if defined(USE_X11)
   if (windowless_shm_pixmaps_[0] != None)
-    XFreePixmap(ui::GetXDisplay(), windowless_shm_pixmaps_[0]);
+    XFreePixmap(gfx::GetXDisplay(), windowless_shm_pixmaps_[0]);
   if (windowless_shm_pixmaps_[1] != None)
-    XFreePixmap(ui::GetXDisplay(), windowless_shm_pixmaps_[1]);
+    XFreePixmap(gfx::GetXDisplay(), windowless_shm_pixmaps_[1]);
 #endif
 
 #if defined(OS_MACOSX)
   // Destroy the surface early, since it may send messages during cleanup.
   if (accelerated_surface_)
     accelerated_surface_.reset();
 #endif
 
   if (plugin_element_)
     WebBindings::releaseObject(plugin_element_);
@@ skipping 442 matching lines @@
     canvas->clear();
   }
   *dib_out = new SharedTransportDIB(dib);
 }
 
 void WebPluginProxy::CreateShmPixmapFromDIB(
     TransportDIB* dib,
     const gfx::Rect& window_rect,
     XID* pixmap_out) {
   if (dib) {
-    Display* display = ui::GetXDisplay();
+    XDisplay* display = gfx::GetXDisplay();
     XID root_window = ui::GetX11RootWindow();
     XShmSegmentInfo shminfo = {0};
 
     if (*pixmap_out != None)
       XFreePixmap(display, *pixmap_out);
 
     shminfo.shmseg = dib->MapToX(display);
     // Create a shared memory pixmap based on the image buffer.
     *pixmap_out = XShmCreatePixmap(display, root_window,
                                    NULL, &shminfo,
@@ skipping 146 matching lines @@
   int input_type;
   gfx::Rect caret_rect;
   if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
     return;
 
   Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
 }
 #endif
 
 }  // namespace content