hidpi support for custom cursors in windows

content/common/cursors/webcursor.cc

 // Copyright (c) 2012 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 "content/common/cursors/webcursor.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 
 using blink::WebCursorInfo;
 
 static const int kMaxCursorDimension = 1024;
 
 namespace content {
 
 WebCursor::WebCursor()
     : type_(WebCursorInfo::TypePointer),
       custom_scale_(1) {
 #if defined(OS_WIN)
   external_cursor_ = NULL;
 #endif
   InitPlatformData();
 }
 
-WebCursor::WebCursor(const CursorInfo& cursor_info)
-    : type_(WebCursorInfo::TypePointer) {
-#if defined(OS_WIN)
-  external_cursor_ = NULL;
-#endif
-  InitPlatformData();
-  InitFromCursorInfo(cursor_info);
-}
-
 WebCursor::~WebCursor() {
   Clear();
 }
 
 WebCursor::WebCursor(const WebCursor& other) {
   InitPlatformData();
   Copy(other);
 }
 
 const WebCursor& WebCursor::operator=(const WebCursor& other) {
@@ skipping 179 matching lines @@
 void WebCursor::Copy(const WebCursor& other) {
   type_ = other.type_;
   hotspot_ = other.hotspot_;
   custom_size_ = other.custom_size_;
   custom_scale_ = other.custom_scale_;
   custom_data_ = other.custom_data_;
   CopyPlatformData(other);
 }
 
 void WebCursor::SetCustomData(const SkBitmap& bitmap) {
+  CreateCustomData(bitmap, custom_data_, custom_size_);
+}
+
+void WebCursor::CreateCustomData(const SkBitmap& bitmap,
+                        std::vector<char>& custom_data,

[ananta, 2015/12/15 23:28:17]

Fix alignment for the remaining parameters to be on the same column.

[Bret, 2015/12/16 19:03:58]

Done.

+                        gfx::Size& custom_size) {
   if (bitmap.empty())
     return;
 
-  // Fill custom_data_ directly with the NativeImage pixels.
-  custom_data_.resize(bitmap.getSize());
-  if (!custom_data_.empty()) {
+  // Fill custom_data directly with the NativeImage pixels.
+  custom_data.resize(bitmap.getSize());
+  if (!custom_data.empty()) {
     //This will divide color values by alpha (un-premultiply) if necessary
     SkImageInfo dstInfo = bitmap.info().makeAlphaType(kUnpremul_SkAlphaType);
-    bitmap.readPixels(dstInfo, &custom_data_[0], dstInfo.minRowBytes(), 0, 0);
+    bitmap.readPixels(dstInfo, &custom_data[0], dstInfo.minRowBytes(), 0, 0);
   }
-  custom_size_.set_width(bitmap.width());
-  custom_size_.set_height(bitmap.height());
+  custom_size.set_width(bitmap.width());
+  custom_size.set_height(bitmap.height());
 }
 
 void WebCursor::ImageFromCustomData(SkBitmap* image) const {
   if (custom_data_.empty())
     return;
 
   SkImageInfo image_info = SkImageInfo::MakeN32(custom_size_.width(),
                                                 custom_size_.height(),
                                                 kUnpremul_SkAlphaType);
   if (!image->tryAllocPixels(image_info))
     return;
   memcpy(image->getPixels(), &custom_data_[0], custom_data_.size());
 }
 
 void WebCursor::ClampHotspot() {
   if (!IsCustom())
     return;
 
   // Clamp the hotspot to the custom image's dimensions.
   hotspot_.set_x(std::max(0,
                           std::min(custom_size_.width() - 1, hotspot_.x())));
   hotspot_.set_y(std::max(0,
                           std::min(custom_size_.height() - 1, hotspot_.y())));
 }
 
 }  // namespace content