<!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>[171685] 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/171685">171685</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-28 12:35:48 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Let WheelEvent wrap a PlatformWheelEvent
https://bugs.webkit.org/show_bug.cgi?id=135244
WheelEvent now wraps a PlatformWheelEvent. m_directionInvertedFromDevice, as well as m_phase and m_momentumPhase
have been removed, since the information is redundant in PlatformWheelEvent. Note that deltaX and deltaY have
NOT been replaced, since we need double precision instead of float precision.
Patch by Wenson Hsieh <wenson_hsieh@apple.com> on 2014-07-28
Reviewed by Beth Dakin.
No new tests, since behavior should not have changed.
* dom/WheelEvent.cpp:
(WebCore::WheelEvent::WheelEvent):
(WebCore::WheelEvent::initWheelEvent):
* dom/WheelEvent.h:
(WebCore::WheelEvent::wheelEvent): Returns a non-null pointer to the PlatformWheelEvent iff WheelEvent was initialized by PlatformWheelEvent.
(WebCore::WheelEvent::webkitDirectionInvertedFromDevice): Updated to use PlatformWheelEvent.
(WebCore::WheelEvent::phase): Updated to use PlatformWheelEvent.
(WebCore::WheelEvent::momentumPhase): Updated to use PlatformWheelEvent.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomWheelEventcpp">trunk/Source/WebCore/dom/WheelEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomWheelEventh">trunk/Source/WebCore/dom/WheelEvent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171684 => 171685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-28 19:31:03 UTC (rev 171684)
+++ trunk/Source/WebCore/ChangeLog 2014-07-28 19:35:48 UTC (rev 171685)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-28 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Let WheelEvent wrap a PlatformWheelEvent
+ https://bugs.webkit.org/show_bug.cgi?id=135244
+
+ WheelEvent now wraps a PlatformWheelEvent. m_directionInvertedFromDevice, as well as m_phase and m_momentumPhase
+ have been removed, since the information is redundant in PlatformWheelEvent. Note that deltaX and deltaY have
+ NOT been replaced, since we need double precision instead of float precision.
+
+ Reviewed by Beth Dakin.
+
+ No new tests, since behavior should not have changed.
+
+ * dom/WheelEvent.cpp:
+ (WebCore::WheelEvent::WheelEvent):
+ (WebCore::WheelEvent::initWheelEvent):
+ * dom/WheelEvent.h:
+ (WebCore::WheelEvent::wheelEvent): Returns a non-null pointer to the PlatformWheelEvent iff WheelEvent was initialized by PlatformWheelEvent.
+ (WebCore::WheelEvent::webkitDirectionInvertedFromDevice): Updated to use PlatformWheelEvent.
+ (WebCore::WheelEvent::phase): Updated to use PlatformWheelEvent.
+ (WebCore::WheelEvent::momentumPhase): Updated to use PlatformWheelEvent.
+
</ins><span class="cx"> 2014-07-28 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed 'merge' fix.
</span></span></pre></div>
<a id="trunkSourceWebCoredomWheelEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WheelEvent.cpp (171684 => 171685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WheelEvent.cpp 2014-07-28 19:31:03 UTC (rev 171684)
+++ trunk/Source/WebCore/dom/WheelEvent.cpp 2014-07-28 19:35:48 UTC (rev 171685)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> , m_deltaY(0)
</span><span class="cx"> , m_deltaZ(0)
</span><span class="cx"> , m_deltaMode(DOM_DELTA_PIXEL)
</span><del>- , m_directionInvertedFromDevice(false)
</del><ins>+ , m_initializedWithPlatformWheelEvent(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> , m_deltaY(initializer.deltaY ? initializer.deltaY : -initializer.wheelDeltaY)
</span><span class="cx"> , m_deltaZ(initializer.deltaZ)
</span><span class="cx"> , m_deltaMode(initializer.deltaMode)
</span><ins>+ , m_initializedWithPlatformWheelEvent(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,12 +76,8 @@
</span><span class="cx"> , m_deltaY(-event.deltaY())
</span><span class="cx"> , m_deltaZ(0)
</span><span class="cx"> , m_deltaMode(determineDeltaMode(event))
</span><del>- , m_directionInvertedFromDevice(event.directionInvertedFromDevice())
- , m_wheelEvent(std::make_unique<PlatformWheelEvent>(event))
-#if PLATFORM(MAC)
- , m_phase(event.phase())
- , m_momentumPhase(event.momentumPhase())
-#endif
</del><ins>+ , m_wheelEvent(event)
+ , m_initializedWithPlatformWheelEvent(true)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -103,7 +100,6 @@
</span><span class="cx"> m_deltaY = -rawDeltaY;
</span><span class="cx">
</span><span class="cx"> m_deltaMode = DOM_DELTA_PIXEL;
</span><del>- m_directionInvertedFromDevice = false;
</del><span class="cx">
</span><span class="cx"> initCoordinates(IntPoint(pageX, pageY));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WheelEvent.h (171684 => 171685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WheelEvent.h 2014-07-28 19:31:03 UTC (rev 171684)
+++ trunk/Source/WebCore/dom/WheelEvent.h 2014-07-28 19:35:48 UTC (rev 171685)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> int screenX, int screenY, int pageX, int pageY,
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
</span><span class="cx">
</span><del>- const PlatformWheelEvent* wheelEvent() const { return m_wheelEvent.get(); }
</del><ins>+ const PlatformWheelEvent* wheelEvent() const { return m_initializedWithPlatformWheelEvent ? &m_wheelEvent : nullptr; }
</ins><span class="cx"> double deltaX() const { return m_deltaX; } // Positive when scrolling right.
</span><span class="cx"> double deltaY() const { return m_deltaY; } // Positive when scrolling down.
</span><span class="cx"> double deltaZ() const { return m_deltaZ; }
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> int wheelDeltaY() const { return m_wheelDelta.y(); } // Deprecated, negative when scrolling down.
</span><span class="cx"> unsigned deltaMode() const { return m_deltaMode; }
</span><span class="cx">
</span><del>- bool webkitDirectionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
</del><ins>+ bool webkitDirectionInvertedFromDevice() const { return m_wheelEvent.directionInvertedFromDevice(); }
</ins><span class="cx"> // Needed for Objective-C legacy support
</span><span class="cx"> bool isHorizontal() const { return m_wheelDelta.x(); }
</span><span class="cx">
</span><span class="lines">@@ -94,8 +94,8 @@
</span><span class="cx"> virtual bool isMouseEvent() const override;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- PlatformWheelEventPhase phase() const { return m_phase; }
- PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
</del><ins>+ PlatformWheelEventPhase phase() const { return m_wheelEvent.phase(); }
+ PlatformWheelEventPhase momentumPhase() const { return m_wheelEvent.momentumPhase(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -110,13 +110,8 @@
</span><span class="cx"> double m_deltaY;
</span><span class="cx"> double m_deltaZ;
</span><span class="cx"> unsigned m_deltaMode;
</span><del>- bool m_directionInvertedFromDevice;
- std::unique_ptr<PlatformWheelEvent> m_wheelEvent;
-
-#if PLATFORM(MAC)
- PlatformWheelEventPhase m_phase;
- PlatformWheelEventPhase m_momentumPhase;
-#endif
</del><ins>+ PlatformWheelEvent m_wheelEvent;
+ bool m_initializedWithPlatformWheelEvent;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> EVENT_TYPE_CASTS(WheelEvent)
</span></span></pre>
</div>
</div>
</body>
</html>