Adding Ozone CursorLoader and necessary API functions to allow setting the cursor in SoftwareFactor…

ui/base/cursor/cursor_loader_ozone.h

Index: ui/base/cursor/cursor_loader_ozone.h
diff --git a/ui/base/cursor/cursor_loader_null.h b/ui/base/cursor/cursor_loader_ozone.h
similarity index 52%
rename from ui/base/cursor/cursor_loader_null.h
rename to ui/base/cursor/cursor_loader_ozone.h
index 5cb9ced1f201deaeef0a5d653ec249ac124309ba..48b2ce24f962013006831426556abf1196da7a84 100644
--- a/ui/base/cursor/cursor_loader_null.h
+++ b/ui/base/cursor/cursor_loader_ozone.h
@@ -1,36 +1,48 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#ifndef UI_BASE_CURSOR_CURSOR_LOADER_NULL_H_
-#define UI_BASE_CURSOR_CURSOR_LOADER_NULL_H_
+#ifndef UI_BASE_CURSOR_CURSOR_LOADER_OZONE_H_
+#define UI_BASE_CURSOR_CURSOR_LOADER_OZONE_H_
 
-#include "base/compiler_specific.h"
+#include <map>
+
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/cursor/cursor_loader.h"
-#include "ui/base/ui_base_export.h"
+
+namespace gfx {
+class ImageSkia;
+}
 
 namespace ui {
 
-class UI_BASE_EXPORT CursorLoaderNull : public CursorLoader {
+class CursorLoaderOzone : public CursorLoader {

[rjkroege, 2014/02/12 18:03:17]

you might still want this to be UI_BASE_EXPORT

[dnicoara, 2014/02/12 20:44:57]

Done.

  public:
-  CursorLoaderNull();
-  virtual ~CursorLoaderNull();
+  CursorLoaderOzone();
+  virtual ~CursorLoaderOzone();
 
-  // Overridden from CursorLoader:
   virtual void LoadImageCursor(int id,
                                int resource_id,
                                const gfx::Point& hot) OVERRIDE;
+
   virtual void LoadAnimatedCursor(int id,
                                   int resource_id,
                                   const gfx::Point& hot,
                                   int frame_delay_ms) OVERRIDE;
+
   virtual void UnloadAll() OVERRIDE;
+
   virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(CursorLoaderNull);
+  // Pointers are owned by ResourceBundle and must not be freed here.
+  std::map<int, const gfx::ImageSkia*> cursors_;

[dnicoara, 2014/02/12 16:18:20]

Based on my discussion with sadrul@ my understanding is that ResourceBundles are
long lived. So rather than copy the SkBitmaps, just keep a reference to the
shared resources in ResourceBundle.

+
+  SkBitmap invisible_cursor_;
+
+  DISALLOW_COPY_AND_ASSIGN(CursorLoaderOzone);
 };
 
 }  // namespace ui
 
-#endif  // UI_BASE_CURSOR_CURSOR_LOADER_NULL_H_
+#endif  // UI_BASE_CURSOR_CURSOR_LOADER_OZONE_H_