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

Side by Side Diff: ui/ozone/platform/x11/x11_cursor_factory_ozone.h

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/ozone/platform/x11/x11_cursor_factory_ozone.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_ 5 #ifndef UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
6 #define UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_ 6 #define UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
7 7
8 #include <X11/X.h> 8 #include <X11/X.h>
9 9
10 #include <map>
10 #include <memory> 11 #include <memory>
11 #include <unordered_map>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "ui/base/cursor/cursor.h" 15 #include "ui/base/cursor/cursor.h"
16 #include "ui/ozone/public/cursor_factory_ozone.h" 16 #include "ui/ozone/public/cursor_factory_ozone.h"
17 #include "ui/platform_window/x11/x11_cursor_ozone.h" 17 #include "ui/platform_window/x11/x11_cursor_ozone.h"
18 18
19 namespace ui { 19 namespace ui {
20 20
21 // CursorFactoryOzone implementation for X11 cursors. 21 // CursorFactoryOzone implementation for X11 cursors.
22 class X11CursorFactoryOzone : public CursorFactoryOzone { 22 class X11CursorFactoryOzone : public CursorFactoryOzone {
23 public: 23 public:
24 X11CursorFactoryOzone(); 24 X11CursorFactoryOzone();
25 ~X11CursorFactoryOzone() override; 25 ~X11CursorFactoryOzone() override;
26 26
27 // CursorFactoryOzone: 27 // CursorFactoryOzone:
28 PlatformCursor GetDefaultCursor(int type) override; 28 PlatformCursor GetDefaultCursor(CursorType type) override;
29 PlatformCursor CreateImageCursor(const SkBitmap& bitmap, 29 PlatformCursor CreateImageCursor(const SkBitmap& bitmap,
30 const gfx::Point& hotspot, 30 const gfx::Point& hotspot,
31 float bitmap_dpi) override; 31 float bitmap_dpi) override;
32 PlatformCursor CreateAnimatedCursor(const std::vector<SkBitmap>& bitmaps, 32 PlatformCursor CreateAnimatedCursor(const std::vector<SkBitmap>& bitmaps,
33 const gfx::Point& hotspot, 33 const gfx::Point& hotspot,
34 int frame_delay_ms, 34 int frame_delay_ms,
35 float bitmap_dpi) override; 35 float bitmap_dpi) override;
36 void RefImageCursor(PlatformCursor cursor) override; 36 void RefImageCursor(PlatformCursor cursor) override;
37 void UnrefImageCursor(PlatformCursor cursor) override; 37 void UnrefImageCursor(PlatformCursor cursor) override;
38 38
39 private: 39 private:
40 // Loads/caches default cursor or returns cached version. 40 // Loads/caches default cursor or returns cached version.
41 scoped_refptr<X11CursorOzone> GetDefaultCursorInternal(int type); 41 scoped_refptr<X11CursorOzone> GetDefaultCursorInternal(CursorType type);
42 42
43 // Holds a single instance of the invisible cursor. X11 has no way to hide 43 // Holds a single instance of the invisible cursor. X11 has no way to hide
44 // the cursor so an invisible cursor mimics that. 44 // the cursor so an invisible cursor mimics that.
45 scoped_refptr<X11CursorOzone> invisible_cursor_; 45 scoped_refptr<X11CursorOzone> invisible_cursor_;
46 46
47 std::unordered_map<int, scoped_refptr<X11CursorOzone>> default_cursors_; 47 std::map<CursorType, scoped_refptr<X11CursorOzone>> default_cursors_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(X11CursorFactoryOzone); 49 DISALLOW_COPY_AND_ASSIGN(X11CursorFactoryOzone);
50 }; 50 };
51 51
52 } // namespace ui 52 } // namespace ui
53 53
54 #endif // UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_ 54 #endif // UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
OLDNEW
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/ozone/platform/x11/x11_cursor_factory_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698