Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(942)

Unified Diff: ui/base/x/x11_util.cc

Issue 10382016: Revert 135378 - Aura: Adds custom cursors for drag and drop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/x/x11_util.h ('k') | ui/gfx/codec/png_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/x/x11_util.cc
===================================================================
--- ui/base/x/x11_util.cc (revision 135380)
+++ ui/base/x/x11_util.cc (working copy)
@@ -37,8 +37,6 @@
#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)
@@ -413,25 +411,6 @@
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() {
« no previous file with comments | « ui/base/x/x11_util.h ('k') | ui/gfx/codec/png_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698