<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179056] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179056">179056</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-23 21:26:41 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformCursorh">trunk/Source/WebCore/platform/Cursor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinCursorWincpp">trunk/Source/WebCore/platform/win/CursorWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179055 => 179056)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-23 Brent Fulgham <bfulgham@apple.com>
+
+ [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.
+
</ins><span class="cx"> 2015-01-23 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add pointer/hover media queries
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Cursor.h (179055 => 179056)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -133,6 +133,9 @@
</span><span class="cx"> // This is an invalid Cursor and should never actually get used.
</span><span class="cx"> : m_type(static_cast<Type>(-1))
</span><span class="cx"> , m_platformCursor(0)
</span><ins>+#if ENABLE(MOUSE_CURSOR_SCALE)
+ , m_imageScaleFactor(1)
+#endif
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinCursorWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/CursorWin.cpp (179055 => 179056)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -272,6 +272,9 @@
</span><span class="cx"> : m_type(other.m_type)
</span><span class="cx"> , m_image(other.m_image)
</span><span class="cx"> , m_hotSpot(other.m_hotSpot)
</span><ins>+#if ENABLE(MOUSE_CURSOR_SCALE)
+ , m_imageScaleFactor(other.m_imageScaleFactor)
+#endif
</ins><span class="cx"> , m_platformCursor(other.m_platformCursor)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>