diff options
Diffstat (limited to 'chromium/ui/base/cursor/cursor_loader_x11.h')
| -rw-r--r-- | chromium/ui/base/cursor/cursor_loader_x11.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chromium/ui/base/cursor/cursor_loader_x11.h b/chromium/ui/base/cursor/cursor_loader_x11.h index a0265ffe3ae..331529b3b2c 100644 --- a/chromium/ui/base/cursor/cursor_loader_x11.h +++ b/chromium/ui/base/cursor/cursor_loader_x11.h @@ -11,13 +11,13 @@ #include "base/compiler_specific.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_loader.h" -#include "ui/base/ui_export.h" +#include "ui/base/ui_base_export.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/display.h" namespace ui { -class UI_EXPORT CursorLoaderX11 : public CursorLoader { +class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader { public: CursorLoaderX11(); virtual ~CursorLoaderX11(); @@ -33,6 +33,8 @@ class UI_EXPORT CursorLoaderX11 : public CursorLoader { virtual void UnloadAll() OVERRIDE; virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE; + const XcursorImage* GetXcursorImageForTest(int id); + private: // Returns true if we have an image resource loaded for the |native_cursor|. bool IsImageCursor(gfx::NativeCursor native_cursor); @@ -56,15 +58,6 @@ class UI_EXPORT CursorLoaderX11 : public CursorLoader { DISALLOW_COPY_AND_ASSIGN(CursorLoaderX11); }; -// Scale and rotate the cursor's bitmap and hotpoint. -// |bitmap_in_out| and |hotpoint_in_out| are used as -// both input and output. -UI_EXPORT void ScaleAndRotateCursorBitmapAndHotpoint( - float scale, - gfx::Display::Rotation rotation, - SkBitmap* bitmap_in_out, - gfx::Point* hotpoint_in_out); - } // namespace ui #endif // UI_BASE_CURSOR_CURSOR_LOADER_X11_H_ |