hidpi support for custom cursors in windows

content/common/cursors/webcursor.h

 // 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.
 
 #ifndef CONTENT_COMMON_CURSORS_WEBCURSOR_H_
 #define CONTENT_COMMON_CURSORS_WEBCURSOR_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 53 matching lines @@
     blink::WebCursorInfo::Type type;
     gfx::Point hotspot;
     float image_scale_factor;
     SkBitmap custom_image;
 #if defined(OS_WIN)
     HCURSOR external_handle;
 #endif
   };
 
   WebCursor();
-  explicit WebCursor(const CursorInfo& cursor_info);
   ~WebCursor();
 
   // Copy constructor/assignment operator combine.
   WebCursor(const WebCursor& other);
   const WebCursor& operator=(const WebCursor& other);
 
   // Conversion from/to CursorInfo.
   void InitFromCursorInfo(const CursorInfo& cursor_info);
   void GetCursorInfo(CursorInfo* cursor_info) const;
 
@@ skipping 19 matching lines @@
   // APIs on it.
   void InitFromExternalCursor(HCURSOR handle);
 #endif
 
 #if defined(USE_AURA)
   ui::PlatformCursor GetPlatformCursor();
 
   // Updates |device_scale_factor_| and |rotation_| based on |display|.
   void SetDisplayInfo(const gfx::Display& display);
 
+  float GetCursorScaleFactor();
+  void CreateScaledBitmapAndHotspotFromCustomData(

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

Newline between functions

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

Done.

+    SkBitmap* bitmap,

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

Fix indent to 4 spaces.

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

Done.

+    gfx::Point* hotspot);
+
 #elif defined(OS_WIN)
   // Returns a HCURSOR representing the current WebCursor instance.
   // The ownership of the HCURSOR (does not apply to external cursors) remains
   // with the WebCursor instance.
   HCURSOR GetCursor(HINSTANCE module_handle);
 
 #elif defined(OS_MACOSX)
   // Initialize this from the given Cocoa NSCursor.
   void InitFromNSCursor(NSCursor* cursor);
 #endif
@@ skipping 16 matching lines @@
   // matches that of the cursor passed in.
   bool IsPlatformDataEqual(const WebCursor& other) const ;
 
   // Copies platform specific data from the WebCursor instance passed in.
   void CopyPlatformData(const WebCursor& other);
 
   // Platform specific cleanup.
   void CleanupPlatformData();
 
   void SetCustomData(const SkBitmap& image);
+  void CreateCustomData(const SkBitmap& bitmap,

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

Newline between functions

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

Some comments for this function would be helpful.

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

Done.

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

Done.

+                        std::vector<char>& custom_data,

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

We don't use reference parameters for output as per convention. Please change to
pointers.

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

Done.

+                        gfx::Size& custom_size);
   void ImageFromCustomData(SkBitmap* image) const;
 
   // Clamp the hotspot to the custom image's bounds, if this is a custom cursor.
   void ClampHotspot();
 
   // WebCore::PlatformCursor type.
   int type_;
 
   // Hotspot in cursor image in pixels.
   gfx::Point hotspot_;
 
   // Custom cursor data, as 32-bit RGBA.
   // Platform-inspecific because it can be serialized.
   gfx::Size custom_size_;  // In pixels.
   float custom_scale_;
   std::vector<char> custom_data_;
 
 #if defined(OS_WIN)
   // An externally generated HCURSOR. We assume that it remains valid, i.e we
   // don't attempt to copy the HCURSOR.
   HCURSOR external_cursor_;
 #endif
 
 #if defined(USE_AURA) && (defined(USE_X11) || defined(USE_OZONE))
   // Only used for custom cursors.
   ui::PlatformCursor platform_cursor_;
-  float device_scale_factor_;
 #elif defined(OS_WIN)
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #endif
+#if defined(USE_AURA)

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

USE_AURA is no longer optional. So remove the ifdef

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

This file is used by mac so the check needs to stay.

+  float device_scale_factor_;
+#endif
 
 #if defined(USE_OZONE)
   gfx::Display::Rotation rotation_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_CURSORS_WEBCURSOR_H_