<!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>[183021] 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/183021">183021</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 12:03:00 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Should remove mouseForceClick and mouseForceCancelled from DOM force events
https://bugs.webkit.org/show_bug.cgi?id=143904
-and corresponding-
rdar://problem/20578842
Reviewed by Dan Bernstein.
Source/WebCore:
After more thought and discussion, we decided to remove mouseForceClick and
mouseForceCancelled from DOM force events. mouseForceClick is confusing and
redundant. mouseForceCancelled is confusing as it is currently implemented, and
all of its functionality can be filled by exisiting events such as mouseup,
mouseout, etc.
* dom/Document.cpp:
(WebCore::Document::addListenerTypeIfNeeded):
* dom/Document.h:
* dom/Document.idl:
* dom/Element.cpp:
(WebCore::Element::dispatchMouseForceWillBegin):
(WebCore::Element::dispatchMouseForceClick): Deleted.
(WebCore::Element::dispatchMouseForceCancelled): Deleted.
* dom/Element.h:
* dom/Element.idl:
* dom/EventNames.h:
* html/HTMLAttributeNames.in:
* html/HTMLBodyElement.cpp:
(WebCore::HTMLBodyElement::createWindowEventHandlerNameMap):
* html/HTMLBodyElement.idl:
* html/HTMLElement.cpp:
(WebCore::HTMLElement::createEventHandlerNameMap):
* page/DOMWindow.idl:
Source/WebKit2:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::immediateActionDidCancel):</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="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttributeNamesin">trunk/Source/WebCore/html/HTMLAttributeNames.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLBodyElementcpp">trunk/Source/WebCore/html/HTMLBodyElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLBodyElementidl">trunk/Source/WebCore/html/HTMLBodyElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowidl">trunk/Source/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/ChangeLog 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-04-20 Beth Dakin <bdakin@apple.com>
+
+ Should remove mouseForceClick and mouseForceCancelled from DOM force events
+ https://bugs.webkit.org/show_bug.cgi?id=143904
+ -and corresponding-
+ rdar://problem/20578842
+
+ Reviewed by Dan Bernstein.
+
+ After more thought and discussion, we decided to remove mouseForceClick and
+ mouseForceCancelled from DOM force events. mouseForceClick is confusing and
+ redundant. mouseForceCancelled is confusing as it is currently implemented, and
+ all of its functionality can be filled by exisiting events such as mouseup,
+ mouseout, etc.
+
+ * dom/Document.cpp:
+ (WebCore::Document::addListenerTypeIfNeeded):
+ * dom/Document.h:
+ * dom/Document.idl:
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchMouseForceWillBegin):
+ (WebCore::Element::dispatchMouseForceClick): Deleted.
+ (WebCore::Element::dispatchMouseForceCancelled): Deleted.
+ * dom/Element.h:
+ * dom/Element.idl:
+ * dom/EventNames.h:
+ * html/HTMLAttributeNames.in:
+ * html/HTMLBodyElement.cpp:
+ (WebCore::HTMLBodyElement::createWindowEventHandlerNameMap):
+ * html/HTMLBodyElement.idl:
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::createEventHandlerNameMap):
+ * page/DOMWindow.idl:
+
</ins><span class="cx"> 2015-04-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Setting inline style to the same value it already has triggers a style recalc
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -4020,10 +4020,6 @@
</span><span class="cx"> addListenerType(FORCEDOWN_LISTENER);
</span><span class="cx"> else if (eventType == eventNames().webkitmouseforceupEvent)
</span><span class="cx"> addListenerType(FORCEUP_LISTENER);
</span><del>- else if (eventType == eventNames().webkitmouseforceclickEvent)
- addListenerType(FORCECLICK_LISTENER);
- else if (eventType == eventNames().webkitmouseforcecancelledEvent)
- addListenerType(FORCECANCELLED_LISTENER);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSStyleDeclaration* Document::getOverrideStyle(Element*, const String&)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/Document.h 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -775,9 +775,7 @@
</span><span class="cx"> FORCEWILLBEGIN_LISTENER = 1 << 13,
</span><span class="cx"> FORCECHANGED_LISTENER = 1 << 14,
</span><span class="cx"> FORCEDOWN_LISTENER = 1 << 15,
</span><del>- FORCEUP_LISTENER = 1 << 16,
- FORCECLICK_LISTENER = 1 << 17,
- FORCECANCELLED_LISTENER = 1 << 18
</del><ins>+ FORCEUP_LISTENER = 1 << 16
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool hasListenerType(ListenerType listenerType) const { return (m_listenerTypes & listenerType); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/Document.idl 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -301,9 +301,7 @@
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventHandler onwebkitwillrevealright;
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventHandler onwebkitwillrevealtop;
</span><span class="cx">
</span><del>- [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcecancelled;
</del><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcechanged;
</span><del>- [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceclick;
</del><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcedown;
</span><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceup;
</span><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcewillbegin;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -2260,53 +2260,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
-void Element::dispatchMouseForceClick()
-{
- if (!document().hasListenerType(Document::FORCECLICK_LISTENER))
- return;
-
- Frame* frame = document().frame();
- if (!frame)
- return;
-
- PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtForceClick);
- RefPtr<MouseEvent> mouseForceClickEvent = MouseEvent::create(eventNames().webkitmouseforceclickEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
-
- mouseForceClickEvent->setTarget(this);
- dispatchEvent(mouseForceClickEvent);
-}
-
-void Element::dispatchMouseForceCancelled()
-{
- if (!document().hasListenerType(Document::FORCECANCELLED_LISTENER))
- return;
-
- Frame* frame = document().frame();
- if (!frame)
- return;
-
- PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), 0);
- RefPtr<MouseEvent> mouseForceCancelledEvent = MouseEvent::create(eventNames().webkitmouseforcecancelledEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
-
- mouseForceCancelledEvent->setTarget(this);
- dispatchEvent(mouseForceCancelledEvent);
-}
-
-#else // #if ENABLE(MOUSE_FORCE_EVENTS)
-
</del><ins>+#else
</ins><span class="cx"> bool Element::dispatchMouseForceWillBegin()
</span><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
-void Element::dispatchMouseForceClick()
-{
-}
-
-void Element::dispatchMouseForceCancelled()
-{
-}
</del><span class="cx"> #endif // #if ENABLE(MOUSE_FORCE_EVENTS)
</span><span class="cx">
</span><span class="cx"> void Element::mergeWithNextTextNode(Text& node, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/Element.h 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -469,8 +469,6 @@
</span><span class="cx"> virtual void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool dispatchMouseForceWillBegin();
</span><del>- WEBCORE_EXPORT void dispatchMouseForceClick();
- WEBCORE_EXPORT void dispatchMouseForceCancelled();
</del><span class="cx">
</span><span class="cx"> virtual bool willRecalcStyle(Style::Change);
</span><span class="cx"> virtual void didRecalcStyle(Style::Change);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/Element.idl 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -258,9 +258,7 @@
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventHandler onwebkitwillrevealright;
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventHandler onwebkitwillrevealtop;
</span><span class="cx">
</span><del>- [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcecancelled;
</del><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcechanged;
</span><del>- [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceclick;
</del><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcedown;
</span><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcewillbegin;
</span><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceup;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/dom/EventNames.h 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -233,9 +233,7 @@
</span><span class="cx"> macro(webkitkeyadded) \
</span><span class="cx"> macro(webkitkeyerror) \
</span><span class="cx"> macro(webkitkeymessage) \
</span><del>- macro(webkitmouseforcecancelled) \
</del><span class="cx"> macro(webkitmouseforcechanged) \
</span><del>- macro(webkitmouseforceclick) \
</del><span class="cx"> macro(webkitmouseforcedown) \
</span><span class="cx"> macro(webkitmouseforcewillbegin) \
</span><span class="cx"> macro(webkitmouseforceup) \
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttributeNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -270,9 +270,7 @@
</span><span class="cx"> onwebkitkeyadded
</span><span class="cx"> onwebkitkeyerror
</span><span class="cx"> onwebkitkeymessage
</span><del>-onwebkitmouseforcecancelled
</del><span class="cx"> onwebkitmouseforcechanged
</span><del>-onwebkitmouseforceclick
</del><span class="cx"> onwebkitmouseforcedown
</span><span class="cx"> onwebkitmouseforceup
</span><span class="cx"> onwebkitmouseforcewillbegin
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLBodyElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLBodyElement.cpp (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLBodyElement.cpp 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/html/HTMLBodyElement.cpp 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -123,9 +123,7 @@
</span><span class="cx"> &onscrollAttr,
</span><span class="cx"> &onstorageAttr,
</span><span class="cx"> &onunloadAttr,
</span><del>- &onwebkitmouseforcecancelledAttr,
</del><span class="cx"> &onwebkitmouseforcechangedAttr,
</span><del>- &onwebkitmouseforceclickAttr,
</del><span class="cx"> &onwebkitmouseforcedownAttr,
</span><span class="cx"> &onwebkitmouseforceupAttr,
</span><span class="cx"> &onwebkitmouseforcewillbeginAttr,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLBodyElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLBodyElement.idl (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLBodyElement.idl 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/html/HTMLBodyElement.idl 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -45,9 +45,7 @@
</span><span class="cx"> [NotEnumerable, WindowEventHandler] attribute EventHandler onstorage;
</span><span class="cx"> [NotEnumerable, WindowEventHandler] attribute EventHandler onunload;
</span><span class="cx">
</span><del>- [NotEnumerable, WindowEventHandler, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcecancelled;
</del><span class="cx"> [NotEnumerable, WindowEventHandler, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcechanged;
</span><del>- [NotEnumerable, WindowEventHandler, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceclick;
</del><span class="cx"> [NotEnumerable, WindowEventHandler, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcedown;
</span><span class="cx"> [NotEnumerable, WindowEventHandler, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcewillbegin;
</span><span class="cx"> [NotEnumerable, WindowEventHandler, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceup;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -337,9 +337,7 @@
</span><span class="cx"> &onwebkitkeyaddedAttr,
</span><span class="cx"> &onwebkitkeyerrorAttr,
</span><span class="cx"> &onwebkitkeymessageAttr,
</span><del>- &onwebkitmouseforcecancelledAttr,
</del><span class="cx"> &onwebkitmouseforcechangedAttr,
</span><del>- &onwebkitmouseforceclickAttr,
</del><span class="cx"> &onwebkitmouseforcedownAttr,
</span><span class="cx"> &onwebkitmouseforcewillbeginAttr,
</span><span class="cx"> &onwebkitmouseforceupAttr,
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.idl (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.idl 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -285,9 +285,7 @@
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventHandler onwebkitwillrevealright;
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventHandler onwebkitwillrevealtop;
</span><span class="cx">
</span><del>- [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcecancelled;
</del><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcechanged;
</span><del>- [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceclick;
</del><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcedown;
</span><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforceup;
</span><span class="cx"> [NotEnumerable, Conditional=MOUSE_FORCE_EVENTS] attribute EventHandler onwebkitmouseforcewillbegin;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-20 Beth Dakin <bdakin@apple.com>
+
+ Should remove mouseForceClick and mouseForceCancelled from DOM force events
+ https://bugs.webkit.org/show_bug.cgi?id=143904
+ -and corresponding-
+ rdar://problem/20578842
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::immediateActionDidCancel):
+
</ins><span class="cx"> 2015-04-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement immediate action support for tel: and mailto: URLs
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (183020 => 183021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-04-20 18:48:41 UTC (rev 183020)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-04-20 19:03:00 UTC (rev 183021)
</span><span class="lines">@@ -1149,12 +1149,6 @@
</span><span class="cx"> void WebPage::immediateActionDidCancel()
</span><span class="cx"> {
</span><span class="cx"> m_page->mainFrame().eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelled);
</span><del>-
- Element* element = m_lastActionMenuHitTestResult.innerElement();
- if (!element)
- return;
-
- element->dispatchMouseForceCancelled();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::immediateActionDidComplete()
</span></span></pre>
</div>
</div>
</body>
</html>