[Win] Cursor assignment operator is skipping scale factor

https://bugs.webkit.org/show_bug.cgi?id=140852

Reviewed by Chris Dumez.

Found by fast/events/mouse-cursor-image-set.html

* platform/win/CursorWin.cpp:
(WebCore::Cursor::operator=): Make sure to also assign the
scale factor.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 983fd8f..f599f48 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2015-01-23  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Cursor assignment operator is skipping scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=140852
+
+        Reviewed by Chris Dumez.
+
+        Found by fast/events/mouse-cursor-image-set.html
+
+        * platform/win/CursorWin.cpp:
+        (WebCore::Cursor::operator=): Make sure to also assign the
+        scale factor.
+
 2015-01-23  David Kilzer  <ddkilzer@apple.com>
 
         [iOS] Attempt to fix the build after AVValueTiming.h moved

diff --git a/Source/WebCore/platform/win/CursorWin.cpp b/Source/WebCore/platform/win/CursorWin.cpp
index 80e96eb..e235b81 100644 (file)
--- a/Source/WebCore/platform/win/CursorWin.cpp
+++ b/Source/WebCore/platform/win/CursorWin.cpp
@@ -284,6 +284,9 @@ Cursor& Cursor::operator=(const Cursor& other)
     m_type = other.m_type;
     m_image = other.m_image;
     m_hotSpot = other.m_hotSpot;
+#if ENABLE(MOUSE_CURSOR_SCALE)
+    m_imageScaleFactor = other.m_imageScaleFactor;
+#endif
     m_platformCursor = other.m_platformCursor;
     return *this;
 }