<!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>[172786] branches/safari-600.1-branch/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/172786">172786</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 16:45:13 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172705">r172705</a>. <rdar://problem/17767169></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageEventHandlercpp">branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageEventHandlerh">branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepagemacEventHandlerMacmm">branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172785 => 172786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-08-19 23:45:13 UTC (rev 172786)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172705. <rdar://problem/17767169>
+
+ 2014-08-18 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Follow-up to r136040 based on Darin Adler's comments.
+
+ Pass Widget* as a Widget&, since it can never be null.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::platformCompletePlatformWidgetWheelEvent):
+ (WebCore::EventHandler::handleWheelEvent):
+ * page/EventHandler.h:
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformCompleteWheelEvent):
+ (WebCore::EventHandler::platformCompletePlatformWidgetWheelEvent):
+
+2014-08-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172703. <rdar://problem/17767169>
</span><span class="cx">
</span><span class="cx"> 2014-08-17 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp (172785 => 172786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp        2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp        2014-08-19 23:45:13 UTC (rev 172786)
</span><span class="lines">@@ -2534,7 +2534,7 @@
</span><span class="cx"> return didHandleEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget*, ContainerNode*)
</del><ins>+bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode*)
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -2593,7 +2593,7 @@
</span><span class="cx"> scrollableArea->setScrolledProgrammatically(false);
</span><span class="cx"> if (!widget->platformWidget())
</span><span class="cx"> return true;
</span><del>- return platformCompletePlatformWidgetWheelEvent(event, widget, scrollableContainer.get());
</del><ins>+ return platformCompletePlatformWidgetWheelEvent(event, *widget, scrollableContainer.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h (172785 => 172786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h        2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h        2014-08-19 23:45:13 UTC (rev 172786)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> void platformPrepareForWheelEvents(const PlatformWheelEvent&, const HitTestResult&, RefPtr<Element>& eventTarget, RefPtr<ContainerNode>& scrollableContainer, ScrollableArea*&, bool& isOverWidget);
</span><span class="cx"> void platformRecordWheelEvent(const PlatformWheelEvent&);
</span><span class="cx"> bool platformCompleteWheelEvent(const PlatformWheelEvent&, Element* eventTarget, ContainerNode* scrollableContainer, ScrollableArea*);
</span><del>- bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget*, ContainerNode* scrollableContainer);
</del><ins>+ bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode* scrollableContainer);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
</span><span class="cx"> typedef Vector<RefPtr<Touch>> TouchArray;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm (172785 => 172786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm        2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm        2014-08-19 23:45:13 UTC (rev 172786)
</span><span class="lines">@@ -893,10 +893,11 @@
</span><span class="cx"> didHandleWheelEvent = !m_startedGestureAtScrollLimit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If the platform widget is handling the event, we always want to return false.
</del><ins>+ // If the platform widget is handling the event, we always want to return false for WebKit2, but
+ // true for WebKit1.
</ins><span class="cx"> if (view && scrollableArea == view && view->platformWidget())
</span><del>- didHandleWheelEvent = false;
-
</del><ins>+ didHandleWheelEvent = frameHasPlatformWidget(m_frame);
+
</ins><span class="cx"> m_isHandlingWheelEvent = false;
</span><span class="cx"> return didHandleWheelEvent;
</span><span class="cx"> }
</span><span class="lines">@@ -916,10 +917,10 @@
</span><span class="cx"> return didHandleEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent& wheelEvent, const Widget* widget, ContainerNode* scrollableContainer)
</del><ins>+bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent& wheelEvent, const Widget& widget, ContainerNode* scrollableContainer)
</ins><span class="cx"> {
</span><span class="cx"> // WebKit1: Prevent multiple copies of the scrollWheel event from being sent to the NSScrollView widget.
</span><del>- if (frameHasPlatformWidget(m_frame) && widget->isFrameView())
</del><ins>+ if (frameHasPlatformWidget(m_frame) && widget.isFrameView())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (wheelEvent.useLatchedEventElement() && m_latchedScrollableContainer && scrollableContainer == m_latchedScrollableContainer)
</span></span></pre>
</div>
</div>
</body>
</html>