Title: [179056] trunk/Source/WebCore
- Revision
- 179056
- Author
- [email protected]
- Date
- 2015-01-23 21:26:41 -0800 (Fri, 23 Jan 2015)
Log Message
[Win] Cursor copy constructor does not initialize scale factor
https://bugs.webkit.org/show_bug.cgi?id=140849
Reviewed by Antti Koivisto.
Found by fast/events/mouse-cursor-image-set.html
Make sure the scale factor is captured during copy construction. Also make sure
it is properly initialized in the default constructor, since it it used in the
Windows port for some default cursors.
* platform/CursorWin.h:
* platform/win/CursorWin.cpp:
(WebCore::Cursor::Cursor): Make sure copy constructor captures
the scale factor.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179055 => 179056)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 04:15:56 UTC (rev 179055)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 05:26:41 UTC (rev 179056)
@@ -1,3 +1,21 @@
+2015-01-23 Brent Fulgham <[email protected]>
+
+ [Win] Cursor copy constructor does not initialize scale factor
+ https://bugs.webkit.org/show_bug.cgi?id=140849
+
+ Reviewed by Antti Koivisto.
+
+ Found by fast/events/mouse-cursor-image-set.html
+
+ Make sure the scale factor is captured during copy construction. Also make sure
+ it is properly initialized in the default constructor, since it it used in the
+ Windows port for some default cursors.
+
+ * platform/CursorWin.h:
+ * platform/win/CursorWin.cpp:
+ (WebCore::Cursor::Cursor): Make sure copy constructor captures
+ the scale factor.
+
2015-01-23 Benjamin Poulain <[email protected]>
Add pointer/hover media queries
Modified: trunk/Source/WebCore/platform/Cursor.h (179055 => 179056)
--- trunk/Source/WebCore/platform/Cursor.h 2015-01-24 04:15:56 UTC (rev 179055)
+++ trunk/Source/WebCore/platform/Cursor.h 2015-01-24 05:26:41 UTC (rev 179056)
@@ -133,6 +133,9 @@
// This is an invalid Cursor and should never actually get used.
: m_type(static_cast<Type>(-1))
, m_platformCursor(0)
+#if ENABLE(MOUSE_CURSOR_SCALE)
+ , m_imageScaleFactor(1)
+#endif
#endif // !PLATFORM(IOS)
{
}
Modified: trunk/Source/WebCore/platform/win/CursorWin.cpp (179055 => 179056)
--- trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-01-24 04:15:56 UTC (rev 179055)
+++ trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-01-24 05:26:41 UTC (rev 179056)
@@ -272,6 +272,9 @@
: 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)
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
