ozone: Handle default cursors with no bitmap in BitmapCursorFactoryOzone

ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc

 // 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.
 
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/cursor/cursors_aura.h"
 
 namespace ui {
 
 namespace {
 
 BitmapCursorOzone* ToBitmapCursorOzone(PlatformCursor cursor) {
   return static_cast<BitmapCursorOzone*>(cursor);
 }
 
 PlatformCursor ToPlatformCursor(BitmapCursorOzone* cursor) {
   return static_cast<PlatformCursor>(cursor);
 }
 
+scoped_refptr<BitmapCursorOzone> CreateDefaultBitmapCursor(int type) {
+  SkBitmap bitmap;
+  gfx::Point hotspot;
+  if (GetCursorBitmap(type, &bitmap, &hotspot))
+    return new BitmapCursorOzone(bitmap, hotspot);
+  return NULL;
+}
+
 }  // namespace
 
 BitmapCursorFactoryOzone::BitmapCursorFactoryOzone() {}
 
 BitmapCursorFactoryOzone::~BitmapCursorFactoryOzone() {}
 
 // static
 scoped_refptr<BitmapCursorOzone> BitmapCursorFactoryOzone::GetBitmapCursor(
     PlatformCursor platform_cursor) {
   return make_scoped_refptr(ToBitmapCursorOzone(platform_cursor));
 }
 
 PlatformCursor BitmapCursorFactoryOzone::GetDefaultCursor(int type) {
-  if (type == kCursorNone)
-    return NULL;  // NULL is used for hidden cursor.
-
-  if (!default_cursors_.count(type)) {
-    // Create new owned image cursor from default aura bitmap for this type.
-    SkBitmap bitmap;
-    gfx::Point hotspot;
-    CHECK(GetCursorBitmap(type, &bitmap, &hotspot));
-    default_cursors_[type] = new BitmapCursorOzone(bitmap, hotspot);
-  }
-
-  // Returned owned default cursor for this type.
-  return default_cursors_[type];
+  return GetDefaultCursorInternal(type);
 }
 
 PlatformCursor BitmapCursorFactoryOzone::CreateImageCursor(
     const SkBitmap& bitmap,
     const gfx::Point& hotspot) {
   BitmapCursorOzone* cursor = new BitmapCursorOzone(bitmap, hotspot);
   cursor->AddRef();  // Balanced by UnrefImageCursor.
   return ToPlatformCursor(cursor);
 }
 
 void BitmapCursorFactoryOzone::RefImageCursor(PlatformCursor cursor) {
   ToBitmapCursorOzone(cursor)->AddRef();
 }
 
 void BitmapCursorFactoryOzone::UnrefImageCursor(PlatformCursor cursor) {
   ToBitmapCursorOzone(cursor)->Release();
 }
 
+scoped_refptr<BitmapCursorOzone>
+BitmapCursorFactoryOzone::GetDefaultCursorInternal(int type) {
+  if (type == kCursorNone)
+    return NULL;  // NULL is used for hidden cursor.
+
+  if (!default_cursors_.count(type)) {
+    // Create new image cursor from default aura bitmap for this type. We hold a
+    // ref forever because clients do not do refcounting for default cursors.
+    scoped_refptr<BitmapCursorOzone> cursor = CreateDefaultBitmapCursor(type);
+    if (!cursor && type != kCursorPointer)
+      cursor = GetDefaultCursorInternal(kCursorPointer);
+    DCHECK(cursor) << "Failed to load default cursor bitmap";
+    default_cursors_[type] = cursor;
+  }
+
+  // Returned owned default cursor for this type.
+  return default_cursors_[type];
+}
+
 }  // namespace ui