Revert r135533.

ui/base/x/x11_util.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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 19 matching lines @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_FREEBSD)
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #endif
 
 #if defined(USE_AURA)
 #include <X11/Xcursor/Xcursor.h>
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/skia_util.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include "ui/base/gtk/gdk_x_compat.h"
 #include "ui/base/gtk/gtk_compat.h"
 #else
 // TODO(sad): Use the new way of handling X errors when
@@ skipping 354 matching lines @@
   return XCustomCursorCache::GetInstance()->InstallCustomCursor(image);
 }
 
 void RefCustomXCursor(::Cursor cursor) {
   XCustomCursorCache::GetInstance()->Ref(cursor);
 }
 
 void UnrefCustomXCursor(::Cursor cursor) {
   XCustomCursorCache::GetInstance()->Unref(cursor);
 }
-
-XcursorImage* SkBitmapToXcursorImage(const SkBitmap* bitmap,
-                                     const gfx::Point& hotspot) {
-  DCHECK(bitmap->config() == SkBitmap::kARGB_8888_Config);
-  XcursorImage* image = XcursorImageCreate(bitmap->width(), bitmap->height());
-  image->xhot = hotspot.x();
-  image->yhot = hotspot.y();
-
-  if (bitmap->width() && bitmap->height()) {
-    bitmap->lockPixels();
-    gfx::ConvertSkiaToRGBA(
-        static_cast<const unsigned char*>(bitmap->getPixels()),
-        bitmap->width() * bitmap->height(),
-        reinterpret_cast<unsigned char*>(image->pixels));
-    bitmap->unlockPixels();
-  }
-
-  return image;
-}
 #endif
 
 XID GetX11RootWindow() {
   return DefaultRootWindow(GetXDisplay());
 }
 
 bool GetCurrentDesktop(int* desktop) {
   return GetIntProperty(GetX11RootWindow(), "_NET_CURRENT_DESKTOP", desktop);
 }
 
@@ skipping 802 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui