<!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>[212820] branches/safari-603-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/212820">212820</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-22 01:59:55 -0800 (Wed, 22 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212819">r212819</a>. rdar://problem/30640217</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomMouseEventcpp">branches/safari-603-branch/Source/WebCore/dom/MouseEvent.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomMouseEventh">branches/safari-603-branch/Source/WebCore/dom/MouseEvent.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomMouseEventidl">branches/safari-603-branch/Source/WebCore/dom/MouseEvent.idl</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformRuntimeApplicationChecksh">branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformRuntimeApplicationChecksmm">branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212819 => 212820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-22 09:50:42 UTC (rev 212819)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-22 09:59:55 UTC (rev 212820)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-02-22 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212819. rdar://problem/30640217
+
+ 2017-02-22 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212773. rdar://problem/30640217
+
+ 2017-02-21 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (203941): iAd Producer: Clicking buttons in Preview does not work
+ https://bugs.webkit.org/show_bug.cgi?id=168677
+ <rdar://problem/30640101>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add quirk to initMouseEvent to unbreak iAd Producer.
+
+ * dom/MouseEvent.cpp:
+ (WebCore::MouseEvent::initMouseEventQuirk):
+ * dom/MouseEvent.h:
+ * dom/MouseEvent.idl:
+ * platform/RuntimeApplicationChecks.h:
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::MacApplication::isIADProducer):
+
</ins><span class="cx"> 2017-02-21 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r212737. rdar://problem/30636274
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomMouseEventcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/MouseEvent.cpp (212819 => 212820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/MouseEvent.cpp        2017-02-22 09:50:42 UTC (rev 212819)
+++ branches/safari-603-branch/Source/WebCore/dom/MouseEvent.cpp        2017-02-22 09:59:55 UTC (rev 212820)
</span><span class="lines">@@ -28,11 +28,17 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "HTMLIFrameElement.h"
</span><ins>+#include "JSDOMConvert.h"
+#include "JSEventTarget.h"
+#include "JSEventTargetCustom.h"
</ins><span class="cx"> #include "PlatformMouseEvent.h"
</span><ins>+#include "RuntimeApplicationChecks.h"
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+using namespace JSC;
+
</ins><span class="cx"> Ref<MouseEvent> MouseEvent::create(const AtomicString& type, const MouseEventInit& initializer, IsTrusted isTrusted)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new MouseEvent(type, initializer, isTrusted));
</span><span class="lines">@@ -170,6 +176,34 @@
</span><span class="cx"> // FIXME: m_dataTransfer is not set to 0 here.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: We need this quirk because iAd Producer is calling this function with a relatedTarget that is not an EventTarget (rdar://problem/30640101).
+// We should remove this quirk when possible.
+void MouseEvent::initMouseEventQuirk(ExecState& state, ScriptExecutionContext& scriptExecutionContext, const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, JSValue relatedTargetValue)
+{
+ EventTarget* relatedTarget = nullptr;
+#if PLATFORM(MAC)
+ if (MacApplication::isIAdProducer()) {
+ // jsEventTargetCast() does not throw and will silently convert bad input to nullptr.
+ auto jsRelatedTarget = jsEventTargetCast(relatedTargetValue);
+ if (!jsRelatedTarget && !relatedTargetValue.isUndefinedOrNull())
+ scriptExecutionContext.addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("Calling initMouseEvent() with a relatedTarget that is not an EventTarget is deprecated."));
+ relatedTarget = jsRelatedTarget ? &jsRelatedTarget->wrapped() : nullptr;
+ } else {
+#else
+ UNUSED_PARAM(scriptExecutionContext);
+#endif
+ // This is what the bindings generator would have produced.
+ auto throwScope = DECLARE_THROW_SCOPE(state.vm());
+ relatedTarget = convert<IDLNullable<IDLInterface<EventTarget>>>(state, relatedTargetValue, [](ExecState& state, ThrowScope& scope) {
+ throwArgumentTypeError(state, scope, 14, "relatedTarget", "MouseEvent", "initMouseEvent", "EventTarget");
+ });
+ RETURN_IF_EXCEPTION(throwScope, void());
+#if PLATFORM(MAC)
+ }
+#endif
+ initMouseEvent(type, canBubble, cancelable, view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget);
+}
+
</ins><span class="cx"> EventInterface MouseEvent::eventInterface() const
</span><span class="cx"> {
</span><span class="cx"> return MouseEventInterfaceType;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomMouseEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/MouseEvent.h (212819 => 212820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/MouseEvent.h        2017-02-22 09:50:42 UTC (rev 212819)
+++ branches/safari-603-branch/Source/WebCore/dom/MouseEvent.h        2017-02-22 09:59:55 UTC (rev 212820)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> int detail, int screenX, int screenY, int clientX, int clientY,
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
</span><span class="cx"> unsigned short button, PassRefPtr<EventTarget> relatedTarget);
</span><del>-
</del><ins>+ void initMouseEventQuirk(JSC::ExecState&, ScriptExecutionContext&, const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, JSC::JSValue relatedTarget);
</ins><span class="cx"> // WinIE uses 1,4,2 for left/middle/right but not for click (just for mousedown/up, maybe others),
</span><span class="cx"> // but we will match the standard DOM.
</span><span class="cx"> unsigned short button() const { return m_button; }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomMouseEventidl"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/MouseEvent.idl (212819 => 212820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/MouseEvent.idl        2017-02-22 09:50:42 UTC (rev 212819)
+++ branches/safari-603-branch/Source/WebCore/dom/MouseEvent.idl        2017-02-22 09:59:55 UTC (rev 212820)
</span><span class="lines">@@ -39,11 +39,12 @@
</span><span class="cx"> [Conditional=MOUSE_FORCE_EVENTS, ImplementedAs=force]readonly attribute double webkitForce;
</span><span class="cx">
</span><span class="cx"> // FIXME: Using "undefined" as default parameter value is wrong.
</span><del>- void initMouseEvent(optional DOMString type = "undefined", optional boolean canBubble = false, optional boolean cancelable = false,
</del><ins>+ // FIXME: relatedTarget should be of type EventTarget? but we need to use any to support a quirk for iAd Producer (rdar://problem/30640101).
+ [CallWith=ScriptState&ScriptExecutionContext, ImplementedAs=initMouseEventQuirk] void initMouseEvent(optional DOMString type = "undefined", optional boolean canBubble = false, optional boolean cancelable = false,
</ins><span class="cx"> optional DOMWindow? view = null, optional long detail = 0,
</span><span class="cx"> optional long screenX = 0, optional long screenY = 0, optional long clientX = 0, optional long clientY = 0,
</span><span class="cx"> optional boolean ctrlKey = false, optional boolean altKey = false, optional boolean shiftKey = false, optional boolean metaKey = false,
</span><del>- optional unsigned short button = 0, optional EventTarget? relatedTarget = null);
</del><ins>+ optional unsigned short button = 0, optional any relatedTarget = null);
</ins><span class="cx">
</span><span class="cx"> readonly attribute long offsetX;
</span><span class="cx"> readonly attribute long offsetY;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformRuntimeApplicationChecksh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.h (212819 => 212820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.h        2017-02-22 09:50:42 UTC (rev 212819)
+++ branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.h        2017-02-22 09:59:55 UTC (rev 212820)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool isVersions();
</span><span class="cx"> WEBCORE_EXPORT bool isHRBlock();
</span><span class="cx"> WEBCORE_EXPORT bool isAppStore();
</span><ins>+WEBCORE_EXPORT bool isIAdProducer();
</ins><span class="cx">
</span><span class="cx"> } // MacApplication
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm (212819 => 212820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm        2017-02-22 09:50:42 UTC (rev 212819)
+++ branches/safari-603-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm        2017-02-22 09:59:55 UTC (rev 212820)
</span><span class="lines">@@ -148,6 +148,12 @@
</span><span class="cx"> return isHRBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MacApplication::isIAdProducer()
+{
+ static bool isIAdProducer = applicationBundleIsEqualTo("com.apple.iAdProducer");
+ return isIAdProducer;
+}
+
</ins><span class="cx"> bool MacApplication::isSolidStateNetworksDownloader()
</span><span class="cx"> {
</span><span class="cx"> static bool isSolidStateNetworksDownloader = applicationBundleIsEqualTo("com.solidstatenetworks.awkhost");
</span></span></pre>
</div>
</div>
</body>
</html>