<!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>[206964] trunk</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/206964">206964</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-08 20:46:39 -0700 (Sat, 08 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update CustomEvent to stop using legacy [ConstructorTemplate=Event]
https://bugs.webkit.org/show_bug.cgi?id=163174
Reviewed by Darin Adler.
Source/WebCore:
Update CustomEvent to stop using legacy [ConstructorTemplate=Event] and
use an actual constructor instead, like in the specification:
- https://dom.spec.whatwg.org/#interface-customevent
There is a very minor behavior change when explictly passing undefined
as detail value in CustomEventInit. We used to initialize detail to
undefined but we now initialize it to null instead, which is its default
value. The new behavior matches the one of Chrome and Firefox.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDefaultValue):
(GenerateDictionaryImplementationContent):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::convertDictionary<TestObj::Dictionary>):
* bindings/scripts/test/TestObj.idl:
* dom/CustomEvent.cpp:
(WebCore::CustomEvent::CustomEvent):
* dom/CustomEvent.h:
* dom/CustomEvent.idl:
* dom/Document.cpp:
(WebCore::Document::createEvent):
* dom/Event.cpp:
(WebCore::Event::Event):
* dom/Event.h:
LayoutTests:
Update existing layout test to reflect minor behavior change.
* fast/events/constructors/custom-event-constructor-expected.txt:
* fast/events/constructors/custom-event-constructor.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsconstructorscustomeventconstructorexpectedtxt">trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsconstructorscustomeventconstructorhtml">trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCoredomCustomEventcpp">trunk/Source/WebCore/dom/CustomEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomEventh">trunk/Source/WebCore/dom/CustomEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomCustomEventidl">trunk/Source/WebCore/dom/CustomEvent.idl</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventcpp">trunk/Source/WebCore/dom/Event.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventh">trunk/Source/WebCore/dom/Event.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/LayoutTests/ChangeLog 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-10-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Update CustomEvent to stop using legacy [ConstructorTemplate=Event]
+ https://bugs.webkit.org/show_bug.cgi?id=163174
+
+ Reviewed by Darin Adler.
+
+ Update existing layout test to reflect minor behavior change.
+
+ * fast/events/constructors/custom-event-constructor-expected.txt:
+ * fast/events/constructors/custom-event-constructor.html:
+
+2016-10-08 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Add support for ClipboardEvent
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163164
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsconstructorscustomeventconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> PASS new CustomEvent('eventType', { detail: 'string' }).detail is 'string'
</span><span class="cx"> PASS new CustomEvent('eventType', { detail: detailObject }).detail is detailObject
</span><span class="cx"> PASS new CustomEvent('eventType', { detail: document }).detail is document
</span><del>-PASS new CustomEvent('eventType', { detail: undefined }).detail is undefined
</del><ins>+PASS new CustomEvent('eventType', { detail: undefined }).detail is null
</ins><span class="cx"> PASS new CustomEvent('eventType', { detail: null }).detail is null
</span><span class="cx"> PASS new CustomEvent('eventType', { get detail() { return true; } }).detail is true
</span><span class="cx"> PASS new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } }) threw exception Custom Error.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsconstructorscustomeventconstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> shouldBe("new CustomEvent('eventType', { detail: document }).detail", "document");
</span><span class="cx">
</span><span class="cx"> // Detail is undefined.
</span><del>-shouldBe("new CustomEvent('eventType', { detail: undefined }).detail", "undefined");
</del><ins>+shouldBeNull("new CustomEvent('eventType', { detail: undefined }).detail");
</ins><span class="cx">
</span><span class="cx"> // Detail is null.
</span><del>-shouldBe("new CustomEvent('eventType', { detail: null }).detail", "null");
</del><ins>+shouldBeNull("new CustomEvent('eventType', { detail: null }).detail");
</ins><span class="cx">
</span><span class="cx"> // Detail is a getter.
</span><span class="cx"> shouldBe("new CustomEvent('eventType', { get detail() { return true; } }).detail", "true");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/ChangeLog 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2016-10-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Update CustomEvent to stop using legacy [ConstructorTemplate=Event]
+ https://bugs.webkit.org/show_bug.cgi?id=163174
+
+ Reviewed by Darin Adler.
+
+ Update CustomEvent to stop using legacy [ConstructorTemplate=Event] and
+ use an actual constructor instead, like in the specification:
+ - https://dom.spec.whatwg.org/#interface-customevent
+
+ There is a very minor behavior change when explictly passing undefined
+ as detail value in CustomEventInit. We used to initialize detail to
+ undefined but we now initialize it to null instead, which is its default
+ value. The new behavior matches the one of Chrome and Firefox.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDefaultValue):
+ (GenerateDictionaryImplementationContent):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::convertDictionary<TestObj::Dictionary>):
+ * bindings/scripts/test/TestObj.idl:
+ * dom/CustomEvent.cpp:
+ (WebCore::CustomEvent::CustomEvent):
+ * dom/CustomEvent.h:
+ * dom/CustomEvent.idl:
+ * dom/Document.cpp:
+ (WebCore::Document::createEvent):
+ * dom/Event.cpp:
+ (WebCore::Event::Event):
+ * dom/Event.h:
+
+2016-10-08 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Add support for ClipboardEvent
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163164
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -982,7 +982,9 @@
</span><span class="cx"> my $enumerationValueName = GetEnumerationValueName(substr($value, 1, -1));
</span><span class="cx"> $value = $className . "::" . $enumerationValueName;
</span><span class="cx"> }
</span><del>- $value = "nullptr" if $value eq "null";
</del><ins>+ if ($value eq "null") {
+ $value = $member->type eq "any" ? "jsNull()" : "nullptr";
+ }
</ins><span class="cx"> $value = "jsUndefined()" if $value eq "undefined";
</span><span class="cx">
</span><span class="cx"> return $value;
</span><span class="lines">@@ -1089,7 +1091,7 @@
</span><span class="cx"> # For each dictionary member member declared on dictionary, in lexicographical order:
</span><span class="cx"> my @sortedMembers = sort { $a->name cmp $b->name } @{$dictionary->members};
</span><span class="cx"> foreach my $member (@sortedMembers) {
</span><del>- $member->default("undefined") if $member->type eq "any"; # Use undefined as default value for member of type 'any'.
</del><ins>+ $member->default("undefined") if $member->type eq "any" and !defined($member->default); # Use undefined as default value for member of type 'any' unless specified otherwise.
</ins><span class="cx">
</span><span class="cx"> my $type = $member->type;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -488,6 +488,13 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, Nullopt);
</span><span class="cx"> } else
</span><span class="cx"> anyValue = jsUndefined();
</span><ins>+ JSValue anyValueWithNullDefaultValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "anyValueWithNullDefault"));
+ JSC::JSValue anyValueWithNullDefault;
+ if (!anyValueWithNullDefaultValue.isUndefined()) {
+ anyValueWithNullDefault = convert<JSC::JSValue>(state, anyValueWithNullDefaultValue);
+ RETURN_IF_EXCEPTION(throwScope, Nullopt);
+ } else
+ anyValueWithNullDefault = jsNull();
</ins><span class="cx"> JSValue booleanWithDefaultValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "booleanWithDefault"));
</span><span class="cx"> bool booleanWithDefault;
</span><span class="cx"> if (!booleanWithDefaultValue.isUndefined()) {
</span><span class="lines">@@ -682,7 +689,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, Nullopt);
</span><span class="cx"> } else
</span><span class="cx"> unsignedLargeIntegerWithDefault = 0;
</span><del>- return TestObj::Dictionary { WTFMove(enumerationValueWithoutDefault), WTFMove(enumerationValueWithDefault), WTFMove(enumerationValueWithEmptyStringDefault), WTFMove(stringWithDefault), WTFMove(stringWithoutDefault), WTFMove(booleanWithDefault), WTFMove(booleanWithoutDefault), WTFMove(sequenceOfStrings), WTFMove(restrictedDouble), WTFMove(unrestrictedDouble), WTFMove(restrictedDoubleWithDefault), WTFMove(unrestrictedDoubleWithDefault), WTFMove(restrictedFloat), WTFMove(unrestrictedFloat), WTFMove(restrictedFloatWithDefault), WTFMove(unrestrictedFloatWithDefault), WTFMove(smallIntegerClamped), WTFMove(smallIntegerWithDefault), WTFMove(smallUnsignedIntegerEnforcedRange), WTFMove(smallUnsignedIntegerWithDefault), WTFMove(integer), WTFMove(integerWithDefault), WTFMove(unsignedInteger), WTFMove(unsignedIntegerWithDefault), WTFMove(largeInteger), WTFMove(largeIntegerWithDefault), WTFMove(unsignedLargeInteger), WTFMove(unsignedLargeIntegerWithDefault), WTFMove(nullab
leNode), WTFMove(anyValue), WTFMove(anyTypedefValue), dictionaryMember.value() };
</del><ins>+ return TestObj::Dictionary { WTFMove(enumerationValueWithoutDefault), WTFMove(enumerationValueWithDefault), WTFMove(enumerationValueWithEmptyStringDefault), WTFMove(stringWithDefault), WTFMove(stringWithoutDefault), WTFMove(booleanWithDefault), WTFMove(booleanWithoutDefault), WTFMove(sequenceOfStrings), WTFMove(restrictedDouble), WTFMove(unrestrictedDouble), WTFMove(restrictedDoubleWithDefault), WTFMove(unrestrictedDoubleWithDefault), WTFMove(restrictedFloat), WTFMove(unrestrictedFloat), WTFMove(restrictedFloatWithDefault), WTFMove(unrestrictedFloatWithDefault), WTFMove(smallIntegerClamped), WTFMove(smallIntegerWithDefault), WTFMove(smallUnsignedIntegerEnforcedRange), WTFMove(smallUnsignedIntegerWithDefault), WTFMove(integer), WTFMove(integerWithDefault), WTFMove(unsignedInteger), WTFMove(unsignedIntegerWithDefault), WTFMove(largeInteger), WTFMove(largeIntegerWithDefault), WTFMove(unsignedLargeInteger), WTFMove(unsignedLargeIntegerWithDefault), WTFMove(nullabl
eNode), WTFMove(anyValue), WTFMove(anyValueWithNullDefault), WTFMove(anyTypedefValue), dictionaryMember.value() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> Optional<TestObj::DictionaryThatShouldNotTolerateNull> convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>(ExecState& state, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -459,6 +459,7 @@
</span><span class="cx"> unsigned long long unsignedLargeIntegerWithDefault = 0;
</span><span class="cx"> Node? nullableNode = null;
</span><span class="cx"> any anyValue;
</span><ins>+ any anyValueWithNullDefault = null;
</ins><span class="cx"> AnyTypedef anyTypedefValue;
</span><span class="cx"> TestDictionaryThatShouldTolerateNull dictionaryMember;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomEvent.cpp (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomEvent.cpp 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/dom/CustomEvent.cpp 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -31,13 +31,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CustomEvent::CustomEvent()
</del><ins>+CustomEvent::CustomEvent(IsTrusted isTrusted)
+ : Event(isTrusted)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CustomEvent::CustomEvent(const AtomicString& type, const CustomEventInit& initializer)
- : Event(type, initializer)
- , m_detail(initializer.detail)
</del><ins>+CustomEvent::CustomEvent(JSC::ExecState& state, const AtomicString& type, const Init& initializer, IsTrusted isTrusted)
+ : Event(type, initializer, isTrusted)
+ , m_detail(state.vm(), initializer.detail)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomEvent.h (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomEvent.h 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/dom/CustomEvent.h 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -32,22 +32,27 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct CustomEventInit : public EventInit {
- Deprecated::ScriptValue detail;
-};
-
</del><span class="cx"> class CustomEvent final : public Event {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~CustomEvent();
</span><span class="cx">
</span><del>- static Ref<CustomEvent> createForBindings()
</del><ins>+ static Ref<CustomEvent> create(IsTrusted isTrusted = IsTrusted::No)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new CustomEvent);
</del><ins>+ return adoptRef(*new CustomEvent(isTrusted));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<CustomEvent> createForBindings(const AtomicString& type, const CustomEventInit& initializer)
</del><ins>+ struct Init : public EventInit {
+ Init(bool bubbles, bool cancelable, bool composed, JSC::JSValue detail)
+ : EventInit(bubbles, cancelable, composed)
+ , detail(detail)
+ { }
+
+ JSC::JSValue detail;
+ };
+
+ static Ref<CustomEvent> create(JSC::ExecState& state, const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new CustomEvent(type, initializer));
</del><ins>+ return adoptRef(*new CustomEvent(state, type, initializer, isTrusted));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void initCustomEvent(JSC::ExecState&, const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue detail = JSC::JSValue::JSUndefined);
</span><span class="lines">@@ -59,8 +64,8 @@
</span><span class="cx"> RefPtr<SerializedScriptValue> trySerializeDetail(JSC::ExecState&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CustomEvent();
- CustomEvent(const AtomicString& type, const CustomEventInit& initializer);
</del><ins>+ CustomEvent(IsTrusted);
+ CustomEvent(JSC::ExecState&, const AtomicString& type, const Init& initializer, IsTrusted);
</ins><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue m_detail; // FIXME: Why is it OK to use a strong reference here? What prevents a reference cycle?
</span><span class="cx"> RefPtr<SerializedScriptValue> m_serializedDetail;
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomEvent.idl (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomEvent.idl 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/dom/CustomEvent.idl 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -24,10 +24,16 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // Introduced in DOM Level 3:
</span><ins>+// FIXME: This should be exposed to workers as well.
</ins><span class="cx"> [
</span><del>- ConstructorTemplate=Event,
</del><ins>+ Constructor(DOMString type, optional CustomEventInit eventInitDict),
+ ConstructorCallWith=ScriptState,
</ins><span class="cx"> ] interface CustomEvent : Event {
</span><del>- [InitializedByEventConstructor, CustomGetter] readonly attribute any detail;
</del><ins>+ [CustomGetter] readonly attribute any detail;
</ins><span class="cx">
</span><span class="cx"> [CallWith=ScriptState] void initCustomEvent(DOMString type, boolean bubbles, boolean cancelable, any detail);
</span><span class="cx"> };
</span><ins>+
+dictionary CustomEventInit : EventInit {
+ any detail = null;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -4129,7 +4129,7 @@
</span><span class="cx"> // <https://dom.spec.whatwg.org/#dom-document-createevent>.
</span><span class="cx">
</span><span class="cx"> if (equalLettersIgnoringASCIICase(type, "customevent"))
</span><del>- return CustomEvent::createForBindings();
</del><ins>+ return CustomEvent::create();
</ins><span class="cx"> if (equalLettersIgnoringASCIICase(type, "event") || equalLettersIgnoringASCIICase(type, "events") || equalLettersIgnoringASCIICase(type, "htmlevents"))
</span><span class="cx"> return Event::createForBindings();
</span><span class="cx"> if (equalLettersIgnoringASCIICase(type, "keyboardevent") || equalLettersIgnoringASCIICase(type, "keyboardevents"))
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Event.cpp (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Event.cpp 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/dom/Event.cpp 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -31,8 +31,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Event::Event()
- : m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
</del><ins>+Event::Event(IsTrusted isTrusted)
+ : m_isTrusted(isTrusted == IsTrusted::Yes)
+ , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Event.h (206963 => 206964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Event.h 2016-10-09 00:03:14 UTC (rev 206963)
+++ trunk/Source/WebCore/dom/Event.h 2016-10-09 03:46:39 UTC (rev 206964)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> virtual EventTarget* relatedTarget() const { return nullptr; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- Event();
</del><ins>+ Event(IsTrusted = IsTrusted::No);
</ins><span class="cx"> WEBCORE_EXPORT Event(const AtomicString& type, bool canBubble, bool cancelable);
</span><span class="cx"> Event(const AtomicString& type, bool canBubble, bool cancelable, double timestamp);
</span><span class="cx"> Event(const AtomicString& type, const EventInit&, IsTrusted = IsTrusted::No);
</span></span></pre>
</div>
</div>
</body>
</html>