| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/base/cursor/cursor_loader_x11.h" | 5 #include "ui/base/cursor/cursor_loader_x11.h" |
| 6 | 6 |
| 7 #include <float.h> | 7 #include <float.h> |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 #include <X11/cursorfont.h> | 9 #include <X11/cursorfont.h> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "grit/ui_resources.h" | |
| 13 #include "skia/ext/image_operations.h" | 12 #include "skia/ext/image_operations.h" |
| 14 #include "ui/base/cursor/cursor.h" | 13 #include "ui/base/cursor/cursor.h" |
| 15 #include "ui/base/cursor/cursor_util.h" | 14 #include "ui/base/cursor/cursor_util.h" |
| 16 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 17 #include "ui/base/x/x11_util.h" | 16 #include "ui/base/x/x11_util.h" |
| 18 #include "ui/gfx/image/image.h" | 17 #include "ui/gfx/image/image.h" |
| 19 #include "ui/gfx/image/image_skia.h" | 18 #include "ui/gfx/image/image_skia.h" |
| 20 #include "ui/gfx/point_conversions.h" | 19 #include "ui/gfx/point_conversions.h" |
| 21 #include "ui/gfx/size_conversions.h" | 20 #include "ui/gfx/size_conversions.h" |
| 22 #include "ui/gfx/skbitmap_operations.h" | 21 #include "ui/gfx/skbitmap_operations.h" |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 if (animated_cursors_.count(type)) | 257 if (animated_cursors_.count(type)) |
| 259 return animated_cursors_[type].first; | 258 return animated_cursors_[type].first; |
| 260 | 259 |
| 261 ImageCursorMap::iterator find = cursors_.find(type); | 260 ImageCursorMap::iterator find = cursors_.find(type); |
| 262 if (find != cursors_.end()) | 261 if (find != cursors_.end()) |
| 263 return cursors_[type]; | 262 return cursors_[type]; |
| 264 return GetXCursor(CursorShapeFromNative(native_cursor)); | 263 return GetXCursor(CursorShapeFromNative(native_cursor)); |
| 265 } | 264 } |
| 266 | 265 |
| 267 } // namespace ui | 266 } // namespace ui |
| OLD | NEW |