<!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>[181514] trunk/Source</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/181514">181514</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-15 15:47:08 -0700 (Sun, 15 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up related to wheelEvent names
https://bugs.webkit.org/show_bug.cgi?id=142713
Reviewed by Anders Carlsson.
Add EventNames::isWheelEventType() and use it in places that test for the
two wheel event names.
Source/WebCore:
* dom/Document.cpp:
(WebCore::Document::didAddWheelEventHandler):
(WebCore::Document::didRemoveWheelEventHandler):
* dom/Document.h: No need for exports (I grepped). Pass the Node*, which
will be used in a later patch.
* dom/EventNames.h:
(WebCore::EventNames::isWheelEventType):
* dom/Node.cpp:
(WebCore::Node::didMoveToNewDocument):
(WebCore::tryAddEventListener):
(WebCore::tryRemoveEventListener):
(WebCore::Node::defaultEventHandler):
* html/shadow/MediaControlsApple.cpp:
(WebCore::MediaControlsAppleEventListener::handleEvent):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::addEventListener):
(WebCore::DOMWindow::removeEventListener):
* page/ios/FrameIOS.mm:
(WebCore::ancestorRespondingToScrollWheelEvents): Remove dead code.
Source/WebKit2:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::handleEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsApplecpp">trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/ChangeLog 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-03-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Clean up related to wheelEvent names
+ https://bugs.webkit.org/show_bug.cgi?id=142713
+
+ Reviewed by Anders Carlsson.
+
+ Add EventNames::isWheelEventType() and use it in places that test for the
+ two wheel event names.
+
+ * dom/Document.cpp:
+ (WebCore::Document::didAddWheelEventHandler):
+ (WebCore::Document::didRemoveWheelEventHandler):
+ * dom/Document.h: No need for exports (I grepped). Pass the Node*, which
+ will be used in a later patch.
+ * dom/EventNames.h:
+ (WebCore::EventNames::isWheelEventType):
+ * dom/Node.cpp:
+ (WebCore::Node::didMoveToNewDocument):
+ (WebCore::tryAddEventListener):
+ (WebCore::tryRemoveEventListener):
+ (WebCore::Node::defaultEventHandler):
+ * html/shadow/MediaControlsApple.cpp:
+ (WebCore::MediaControlsAppleEventListener::handleEvent):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::addEventListener):
+ (WebCore::DOMWindow::removeEventListener):
+ * page/ios/FrameIOS.mm:
+ (WebCore::ancestorRespondingToScrollWheelEvents): Remove dead code.
+
+2015-03-15 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Remove a redundant repaint when a layer becomes composited
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142711
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -5995,25 +5995,25 @@
</span><span class="cx"> scrollingCoordinator->frameViewWheelEventHandlerCountChanged(frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didAddWheelEventHandler()
</del><ins>+void Document::didAddWheelEventHandler(Node&)
</ins><span class="cx"> {
</span><span class="cx"> ++m_wheelEventHandlerCount;
</span><span class="cx"> wheelEventHandlerCountChanged(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didRemoveWheelEventHandler()
</del><ins>+void Document::didRemoveWheelEventHandler(Node&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_wheelEventHandlerCount > 0);
</span><span class="cx"> --m_wheelEventHandlerCount;
</span><span class="cx"> wheelEventHandlerCountChanged(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didAddTouchEventHandler(Node* handler)
</del><ins>+void Document::didAddTouchEventHandler(Node& handler)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (!m_touchEventTargets.get())
</span><span class="cx"> m_touchEventTargets = std::make_unique<TouchEventTargetSet>();
</span><del>- m_touchEventTargets->add(handler);
</del><ins>+ m_touchEventTargets->add(&handler);
</ins><span class="cx"> if (Document* parent = parentDocument()) {
</span><span class="cx"> parent->didAddTouchEventHandler(this);
</span><span class="cx"> return;
</span><span class="lines">@@ -6027,13 +6027,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didRemoveTouchEventHandler(Node* handler)
</del><ins>+void Document::didRemoveTouchEventHandler(Node& handler)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (!m_touchEventTargets.get())
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(m_touchEventTargets->contains(handler));
</span><del>- m_touchEventTargets->remove(handler);
</del><ins>+ m_touchEventTargets->remove(&handler);
</ins><span class="cx"> if (Document* parent = parentDocument()) {
</span><span class="cx"> parent->didRemoveTouchEventHandler(this);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/dom/Document.h 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -1122,8 +1122,8 @@
</span><span class="cx"> void initDNSPrefetch();
</span><span class="cx">
</span><span class="cx"> unsigned wheelEventHandlerCount() const { return m_wheelEventHandlerCount; }
</span><del>- WEBCORE_EXPORT void didAddWheelEventHandler();
- WEBCORE_EXPORT void didRemoveWheelEventHandler();
</del><ins>+ void didAddWheelEventHandler(Node&);
+ void didRemoveWheelEventHandler(Node&);
</ins><span class="cx">
</span><span class="cx"> double lastHandledUserGestureTimestamp() const { return m_lastHandledUserGestureTimestamp; }
</span><span class="cx"> void updateLastHandledUserGestureTimestamp();
</span><span class="lines">@@ -1134,8 +1134,8 @@
</span><span class="cx"> bool hasTouchEventHandlers() const { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void didAddTouchEventHandler(Node*);
- void didRemoveTouchEventHandler(Node*);
</del><ins>+ void didAddTouchEventHandler(Node&);
+ void didRemoveTouchEventHandler(Node&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> void didRemoveEventTargetNode(Node*);
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/dom/EventNames.h 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -264,6 +264,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Inelegant to call these both event names and event types.
</span><span class="cx"> // We should choose one term and stick to it.
</span><ins>+ bool isWheelEventType(const AtomicString& eventType) const;
</ins><span class="cx"> bool isGestureEventType(const AtomicString& eventType) const;
</span><span class="cx"> bool isTouchEventType(const AtomicString& eventType) const;
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="lines">@@ -299,6 +300,12 @@
</span><span class="cx"> || eventType == touchcancelEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool EventNames::isWheelEventType(const AtomicString& eventType) const
+{
+ return eventType == wheelEvent
+ || eventType == mousewheelEvent;
+}
+
</ins><span class="cx"> inline std::array<std::reference_wrapper<const AtomicString>, 4> EventNames::touchEventNames() const
</span><span class="cx"> {
</span><span class="cx"> return { { touchstartEvent, touchmoveEvent, touchendEvent, touchcancelEvent } };
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -1712,19 +1712,19 @@
</span><span class="cx"> cache->remove(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned numWheelEventHandlers = getEventListeners(eventNames().mousewheelEvent).size()
- + getEventListeners(eventNames().wheelEvent).size();
</del><ins>+ unsigned numWheelEventHandlers = getEventListeners(eventNames().mousewheelEvent).size() + getEventListeners(eventNames().wheelEvent).size();
</ins><span class="cx"> for (unsigned i = 0; i < numWheelEventHandlers; ++i) {
</span><del>- oldDocument->didRemoveWheelEventHandler();
- document().didAddWheelEventHandler();
</del><ins>+ oldDocument->didRemoveWheelEventHandler(*this);
+ document().didAddWheelEventHandler(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned numTouchEventHandlers = 0;
</span><span class="cx"> for (auto& name : eventNames().touchEventNames())
</span><span class="cx"> numTouchEventHandlers += getEventListeners(name).size();
</span><ins>+
</ins><span class="cx"> for (unsigned i = 0; i < numTouchEventHandlers; ++i) {
</span><del>- oldDocument->didRemoveTouchEventHandler(this);
- document().didAddTouchEventHandler(this);
</del><ins>+ oldDocument->didRemoveTouchEventHandler(*this);
+ document().didAddTouchEventHandler(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto* registry = mutationObserverRegistry()) {
</span><span class="lines">@@ -1746,10 +1746,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> targetNode->document().addListenerTypeIfNeeded(eventType);
</span><del>- if (eventType == eventNames().wheelEvent || eventType == eventNames().mousewheelEvent)
- targetNode->document().didAddWheelEventHandler();
</del><ins>+ if (eventNames().isWheelEventType(eventType))
+ targetNode->document().didAddWheelEventHandler(*targetNode);
</ins><span class="cx"> else if (eventNames().isTouchEventType(eventType))
</span><del>- targetNode->document().didAddTouchEventHandler(targetNode);
</del><ins>+ targetNode->document().didAddTouchEventHandler(*targetNode);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (targetNode == &targetNode->document() && eventType == eventNames().scrollEvent)
</span><span class="lines">@@ -1788,10 +1788,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Notify Document that the listener has vanished. We need to keep track of a number of
</span><span class="cx"> // listeners for each type, not just a bool - see https://bugs.webkit.org/show_bug.cgi?id=33861
</span><del>- if (eventType == eventNames().wheelEvent || eventType == eventNames().mousewheelEvent)
- targetNode->document().didRemoveWheelEventHandler();
</del><ins>+ if (eventNames().isWheelEventType(eventType))
+ targetNode->document().didRemoveWheelEventHandler(*targetNode);
</ins><span class="cx"> else if (eventNames().isTouchEventType(eventType))
</span><del>- targetNode->document().didRemoveTouchEventHandler(targetNode);
</del><ins>+ targetNode->document().didRemoveTouchEventHandler(*targetNode);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (targetNode == &targetNode->document() && eventType == eventNames().scrollEvent)
</span><span class="lines">@@ -2086,8 +2086,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- } else if ((eventType == eventNames().wheelEvent || eventType == eventNames().mousewheelEvent) && is<WheelEvent>(*event)) {
-
</del><ins>+ } else if (eventNames().isWheelEventType(eventType) && is<WheelEvent>(*event)) {
</ins><span class="cx"> // If we don't have a renderer, send the wheel event to the first node we find with a renderer.
</span><span class="cx"> // This is needed for <option> and <optgroup> elements so that <select>s get a wheel scroll.
</span><span class="cx"> Node* startNode = this;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx">
</span><span class="cx"> if (DOMWindow* domWindow = m_document->domWindow()) {
</span><span class="cx"> // FIXME: Add SCROLL_LISTENER to the list of event types on Document, and use m_document->hasListenerType(). See <rdar://problem/9615482>.
</span><ins>+ // FIXME: Can use Document::hasListenerType() now.
</ins><span class="cx"> if (domWindow->scrollEventListenerCount() && frame.page())
</span><span class="cx"> frame.page()->chrome().client().setNeedsScrollNotifications(&frame, true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsApplecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -588,7 +588,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (event->type() == eventNames().clickEvent)
</span><span class="cx"> m_mediaControls->handleClickEvent(event);
</span><del>- else if ((event->type() == eventNames().wheelEvent || event->type() == eventNames().mousewheelEvent) && is<WheelEvent>(*event)) {
</del><ins>+ else if (eventNames().isWheelEventType(event->type()) && is<WheelEvent>(*event)) {
</ins><span class="cx"> WheelEvent& wheelEvent = downcast<WheelEvent>(*event);
</span><span class="cx"> if (m_mediaControls->shouldClosedCaptionsContainerPreventPageScrolling(wheelEvent.wheelDeltaY()))
</span><span class="cx"> wheelEvent.preventDefault();
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -1697,10 +1697,10 @@
</span><span class="cx">
</span><span class="cx"> if (Document* document = this->document()) {
</span><span class="cx"> document->addListenerTypeIfNeeded(eventType);
</span><del>- if (eventType == eventNames().wheelEvent || eventType == eventNames().mousewheelEvent)
- document->didAddWheelEventHandler();
</del><ins>+ if (eventNames().isWheelEventType(eventType))
+ document->didAddWheelEventHandler(*document);
</ins><span class="cx"> else if (eventNames().isTouchEventType(eventType))
</span><del>- document->didAddTouchEventHandler(document);
</del><ins>+ document->didAddTouchEventHandler(*document);
</ins><span class="cx"> else if (eventType == eventNames().storageEvent)
</span><span class="cx"> didAddStorageEventListener(this);
</span><span class="cx"> }
</span><span class="lines">@@ -1788,10 +1788,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (Document* document = this->document()) {
</span><del>- if (eventType == eventNames().wheelEvent || eventType == eventNames().mousewheelEvent)
- document->didRemoveWheelEventHandler();
</del><ins>+ if (eventNames().isWheelEventType(eventType))
+ document->didRemoveWheelEventHandler(*document);
</ins><span class="cx"> else if (eventNames().isTouchEventType(eventType))
</span><del>- document->didRemoveTouchEventHandler(document);
</del><ins>+ document->didRemoveTouchEventHandler(*document);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (eventType == eventNames().unloadEvent)
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -273,8 +273,6 @@
</span><span class="cx"> return CGRectZero;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#define ALLOW_SCROLL_LISTENERS 0
-
</del><span class="cx"> static Node* ancestorRespondingToScrollWheelEvents(const HitTestResult& hitTestResult, Node* terminationNode, IntRect* nodeBounds)
</span><span class="cx"> {
</span><span class="cx"> if (nodeBounds)
</span><span class="lines">@@ -282,13 +280,6 @@
</span><span class="cx">
</span><span class="cx"> Node* scrollingAncestor = nullptr;
</span><span class="cx"> for (Node* node = hitTestResult.innerNode(); node && node != terminationNode && !node->hasTagName(HTMLNames::bodyTag); node = node->parentNode()) {
</span><del>-#if ALLOW_SCROLL_LISTENERS
- if (node->willRespondToMouseWheelEvents()) {
- scrollingAncestor = node;
- continue;
- }
-#endif
-
</del><span class="cx"> RenderObject* renderer = node->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-15 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up related to wheelEvent names
+ https://bugs.webkit.org/show_bug.cgi?id=142713
+
+ Reviewed by Anders Carlsson.
+
+ Add EventNames::isWheelEventType() and use it in places that test for the
+ two wheel event names.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::handleEvent):
+
</ins><span class="cx"> 2015-03-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Presenting a modal sheet on top of a WKWebView causes it to lose focused, active state
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (181513 => 181514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-03-15 20:42:44 UTC (rev 181513)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-03-15 22:47:08 UTC (rev 181514)
</span><span class="lines">@@ -919,7 +919,7 @@
</span><span class="cx"> didHandleEvent = m_plugin->handleMouseEvent(static_cast<const WebMouseEvent&>(*currentEvent));
</span><span class="cx"> if (event->type() != eventNames().mousemoveEvent)
</span><span class="cx"> pluginDidReceiveUserInteraction();
</span><del>- } else if ((event->type() == eventNames().wheelEvent || event->type() == eventNames().mousewheelEvent)
</del><ins>+ } else if (eventNames().isWheelEventType(event->type())
</ins><span class="cx"> && currentEvent->type() == WebEvent::Wheel && m_plugin->wantsWheelEvents()) {
</span><span class="cx"> didHandleEvent = m_plugin->handleWheelEvent(static_cast<const WebWheelEvent&>(*currentEvent));
</span><span class="cx"> pluginDidReceiveUserInteraction();
</span></span></pre>
</div>
</div>
</body>
</html>