Making CursorFactoryOzone thread-local

ui/base/cursor/image_cursors.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/image_cursors.h"
 
 #include <float.h>
 #include <stddef.h>
 
 #include "base/logging.h"
@@ skipping 42 matching lines @@
     CursorType::kNorthWestSouthEastResize,
     CursorType::kGrab,
     CursorType::kGrabbing,
 };
 
 const CursorType kAnimatedCursorIds[] = {CursorType::kWait,
                                          CursorType::kProgress};
 
 }  // namespace
 
-ImageCursors::ImageCursors() : cursor_size_(CursorSize::kNormal) {}
+ImageCursors::ImageCursors()
+    : cursor_size_(CursorSize::kNormal), weak_ptr_factory_(this) {}
 
 ImageCursors::~ImageCursors() {
 }
 
+void ImageCursors::Initialize() {
+  if (!cursor_loader_)
+    cursor_loader_.reset(CursorLoader::Create());
+}
+
 float ImageCursors::GetScale() const {
   if (!cursor_loader_) {
     NOTREACHED();
     // Returning default on release build as it's not serious enough to crash
     // even if this ever happens.
     return 1.0f;
   }
   return cursor_loader_->scale();
 }
 
@@ skipping 57 matching lines @@
   cursor_size_ = cursor_size;
 
   if (cursor_loader_.get())
     ReloadCursors();
 }
 
 void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) {
   cursor_loader_->SetPlatformCursor(cursor);
 }
 
+base::WeakPtr<ImageCursors> ImageCursors::GetWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ui