<!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>[199878] 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/199878">199878</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-22 08:59:10 -0700 (Fri, 22 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop [UsePointersEvenForNonNullableObjectArguments] from MutationObserver
https://bugs.webkit.org/show_bug.cgi?id=156890
Reviewed by Darin Adler.
Source/WebCore:
Drop [UsePointersEvenForNonNullableObjectArguments] from MutationObserver
and clean up / modernize the code a bit. There is not significant Web-
exposed behavior change except that MutationObserver.observe() now throws
a different kind of exception (a TypeError as per Web IDL) when passed in
a null Node.
No new tests, rebaselined existing test.
* bindings/js/JSMutationCallback.cpp:
(WebCore::JSMutationCallback::call):
* bindings/js/JSMutationCallback.h:
* bindings/js/JSMutationObserverCustom.cpp:
(WebCore::constructJSMutationObserver):
* css/PropertySetCSSStyleDeclaration.cpp:
* dom/ChildListMutationScope.cpp:
(WebCore::ChildListMutationAccumulator::enqueueMutationRecord):
* dom/MutationCallback.h:
* dom/MutationObserver.cpp:
(WebCore::MutationObserver::create):
(WebCore::MutationObserver::MutationObserver):
(WebCore::MutationObserver::observe):
(WebCore::MutationObserver::takeRecords):
(WebCore::MutationObserver::enqueueMutationRecord):
(WebCore::MutationObserver::deliver):
(WebCore::MutationObserver::disconnect): Deleted.
* dom/MutationObserver.h:
* dom/MutationObserver.idl:
* dom/MutationObserverInterestGroup.cpp:
(WebCore::MutationObserverInterestGroup::enqueueMutationRecord):
* dom/MutationObserverInterestGroup.h:
* dom/MutationRecord.cpp:
(WebCore::MutationRecord::createChildList):
* dom/MutationRecord.h:
LayoutTests:
Rebaseline now that MutationObserver.observe() throws a TypeError instead
of a NOT_FOUND_ERR when passed a null Node.
* fast/dom/MutationObserver/observe-exceptions-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomMutationObserverobserveexceptionsexpectedtxt">trunk/LayoutTests/fast/dom/MutationObserver/observe-exceptions-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMutationCallbackcpp">trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMutationCallbackh">trunk/Source/WebCore/bindings/js/JSMutationCallback.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMutationObserverCustomcpp">trunk/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildListMutationScopecpp">trunk/Source/WebCore/dom/ChildListMutationScope.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationCallbackh">trunk/Source/WebCore/dom/MutationCallback.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationObservercpp">trunk/Source/WebCore/dom/MutationObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverh">trunk/Source/WebCore/dom/MutationObserver.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserveridl">trunk/Source/WebCore/dom/MutationObserver.idl</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverInterestGroupcpp">trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverInterestGrouph">trunk/Source/WebCore/dom/MutationObserverInterestGroup.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationRecordcpp">trunk/Source/WebCore/dom/MutationRecord.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationRecordh">trunk/Source/WebCore/dom/MutationRecord.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/LayoutTests/ChangeLog 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-22 Chris Dumez <cdumez@apple.com>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from MutationObserver
+ https://bugs.webkit.org/show_bug.cgi?id=156890
+
+ Reviewed by Darin Adler.
+
+ Rebaseline now that MutationObserver.observe() throws a TypeError instead
+ of a NOT_FOUND_ERR when passed a null Node.
+
+ * fast/dom/MutationObserver/observe-exceptions-expected.txt:
+
</ins><span class="cx"> 2016-04-22 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r189567): The top of Facebook's messenger.com looks visually broken
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomMutationObserverobserveexceptionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/MutationObserver/observe-exceptions-expected.txt (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/MutationObserver/observe-exceptions-expected.txt 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/LayoutTests/fast/dom/MutationObserver/observe-exceptions-expected.txt 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -7,17 +7,17 @@
</span><span class="cx"> PASS observer.observe(null) threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS observer.observe(undefined) threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS observer.observe(document.body) threw exception TypeError: Not enough arguments.
</span><del>-PASS observer.observe(document.body, null) threw exception Error: SyntaxError: DOM Exception 12.
-PASS observer.observe(document.body, undefined) threw exception Error: SyntaxError: DOM Exception 12.
-PASS observer.observe(null, {attributes: true}) threw exception Error: NotFoundError: DOM Exception 8.
-PASS observer.observe(undefined, {attributes: true}) threw exception Error: NotFoundError: DOM Exception 8.
-PASS observer.observe(document.body, {subtree: true}) threw exception Error: SyntaxError: DOM Exception 12.
</del><ins>+PASS observer.observe(document.body, null) threw exception TypeError: Type error.
+PASS observer.observe(document.body, undefined) threw exception TypeError: Type error.
+PASS observer.observe(null, {attributes: true}) threw exception TypeError: Type error.
+PASS observer.observe(undefined, {attributes: true}) threw exception TypeError: Type error.
+PASS observer.observe(document.body, {subtree: true}) threw exception TypeError: Type error.
</ins><span class="cx"> PASS observer.observe(document.body, {childList: true, attributeOldValue: true}) did not throw exception.
</span><span class="cx"> PASS observer.observe(document.body, {attributes: true, characterDataOldValue: true}) did not throw exception.
</span><span class="cx"> PASS observer.observe(document.body, {characterData: true, attributeFilter: ["id"]}) did not throw exception.
</span><del>-PASS observer.observe(document.body, {attributes: false, attributeOldValue: true}) threw exception Error: SyntaxError: DOM Exception 12.
-PASS observer.observe(document.body, {attributes: false, attributeFilter: ["id"]}) threw exception Error: SyntaxError: DOM Exception 12.
-PASS observer.observe(document.body, {characterData: false, characterDataOldValue: true}) threw exception Error: SyntaxError: DOM Exception 12.
</del><ins>+PASS observer.observe(document.body, {attributes: false, attributeOldValue: true}) threw exception TypeError: Type error.
+PASS observer.observe(document.body, {attributes: false, attributeFilter: ["id"]}) threw exception TypeError: Type error.
+PASS observer.observe(document.body, {characterData: false, characterDataOldValue: true}) threw exception TypeError: Type error.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/ChangeLog 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-04-22 Chris Dumez <cdumez@apple.com>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from MutationObserver
+ https://bugs.webkit.org/show_bug.cgi?id=156890
+
+ Reviewed by Darin Adler.
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from MutationObserver
+ and clean up / modernize the code a bit. There is not significant Web-
+ exposed behavior change except that MutationObserver.observe() now throws
+ a different kind of exception (a TypeError as per Web IDL) when passed in
+ a null Node.
+
+ No new tests, rebaselined existing test.
+
+ * bindings/js/JSMutationCallback.cpp:
+ (WebCore::JSMutationCallback::call):
+ * bindings/js/JSMutationCallback.h:
+ * bindings/js/JSMutationObserverCustom.cpp:
+ (WebCore::constructJSMutationObserver):
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ * dom/ChildListMutationScope.cpp:
+ (WebCore::ChildListMutationAccumulator::enqueueMutationRecord):
+ * dom/MutationCallback.h:
+ * dom/MutationObserver.cpp:
+ (WebCore::MutationObserver::create):
+ (WebCore::MutationObserver::MutationObserver):
+ (WebCore::MutationObserver::observe):
+ (WebCore::MutationObserver::takeRecords):
+ (WebCore::MutationObserver::enqueueMutationRecord):
+ (WebCore::MutationObserver::deliver):
+ (WebCore::MutationObserver::disconnect): Deleted.
+ * dom/MutationObserver.h:
+ * dom/MutationObserver.idl:
+ * dom/MutationObserverInterestGroup.cpp:
+ (WebCore::MutationObserverInterestGroup::enqueueMutationRecord):
+ * dom/MutationObserverInterestGroup.h:
+ * dom/MutationRecord.cpp:
+ (WebCore::MutationRecord::createChildList):
+ * dom/MutationRecord.h:
+
</ins><span class="cx"> 2016-04-22 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r189567): The top of Facebook's messenger.com looks visually broken
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMutationCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSMutationCallback::call(const Vector<RefPtr<MutationRecord>>& mutations, MutationObserver* observer)
</del><ins>+void JSMutationCallback::call(const Vector<Ref<MutationRecord>>& mutations, MutationObserver* observer)
</ins><span class="cx"> {
</span><span class="cx"> if (!canInvokeCallback())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMutationCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMutationCallback.h (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMutationCallback.h 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/bindings/js/JSMutationCallback.h 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~JSMutationCallback();
</span><span class="cx">
</span><del>- void call(const Vector<RefPtr<MutationRecord>>&, MutationObserver*) override;
</del><ins>+ void call(const Vector<Ref<MutationRecord>>&, MutationObserver*) override;
</ins><span class="cx">
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const override { return ContextDestructionObserver::scriptExecutionContext(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMutationObserverCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, "Callback argument must be a function"));
</span><span class="cx">
</span><span class="cx"> DOMConstructorObject* jsConstructor = jsCast<DOMConstructorObject*>(exec->callee());
</span><del>- RefPtr<JSMutationCallback> callback = JSMutationCallback::create(object, jsConstructor->globalObject());
- JSObject* jsObserver = asObject(toJS(exec, jsConstructor->globalObject(), MutationObserver::create(callback.release())));
</del><ins>+ auto callback = JSMutationCallback::create(object, jsConstructor->globalObject());
+ JSObject* jsObserver = asObject(toJS(exec, jsConstructor->globalObject(), MutationObserver::create(WTFMove(callback))));
</ins><span class="cx"> PrivateName propertyName;
</span><span class="cx"> jsObserver->putDirect(jsConstructor->globalObject()->vm(), propertyName, object);
</span><span class="cx"> return JSValue::encode(jsObserver);
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_mutation && s_shouldDeliver)
</span><del>- m_mutationRecipients->enqueueMutationRecord(m_mutation);
</del><ins>+ m_mutationRecipients->enqueueMutationRecord(m_mutation.releaseNonNull());
</ins><span class="cx">
</span><span class="cx"> s_shouldDeliver = false;
</span><span class="cx"> if (!s_shouldNotifyInspector) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildListMutationScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildListMutationScope.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildListMutationScope.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/ChildListMutationScope.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -127,10 +127,8 @@
</span><span class="cx"> ASSERT(hasObservers());
</span><span class="cx"> ASSERT(!isEmpty());
</span><span class="cx">
</span><del>- RefPtr<NodeList> addedNodes = StaticNodeList::adopt(m_addedNodes);
- RefPtr<NodeList> removedNodes = StaticNodeList::adopt(m_removedNodes);
- RefPtr<MutationRecord> record = MutationRecord::createChildList(m_target, addedNodes.release(), removedNodes.release(), m_previousSibling.release(), m_nextSibling.release());
- m_observers->enqueueMutationRecord(record.release());
</del><ins>+ auto record = MutationRecord::createChildList(m_target, StaticNodeList::adopt(m_addedNodes), StaticNodeList::adopt(m_removedNodes), WTFMove(m_previousSibling), WTFMove(m_nextSibling));
+ m_observers->enqueueMutationRecord(WTFMove(record));
</ins><span class="cx"> m_lastAdded = nullptr;
</span><span class="cx"> ASSERT(isEmpty());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationCallback.h (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationCallback.h 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationCallback.h 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MutationCallback() { }
</span><span class="cx">
</span><del>- virtual void call(const Vector<RefPtr<MutationRecord>>&, MutationObserver*) = 0;
</del><ins>+ virtual void call(const Vector<Ref<MutationRecord>>&, MutationObserver*) = 0;
</ins><span class="cx"> virtual ScriptExecutionContext* scriptExecutionContext() const = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationObserver.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx">
</span><span class="cx"> static unsigned s_observerPriority = 0;
</span><span class="cx">
</span><del>-Ref<MutationObserver> MutationObserver::create(PassRefPtr<MutationCallback> callback)
</del><ins>+Ref<MutationObserver> MutationObserver::create(Ref<MutationCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- return adoptRef(*new MutationObserver(callback));
</del><ins>+ return adoptRef(*new MutationObserver(WTFMove(callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-MutationObserver::MutationObserver(PassRefPtr<MutationCallback> callback)
- : m_callback(callback)
</del><ins>+MutationObserver::MutationObserver(Ref<MutationCallback>&& callback)
+ : m_callback(WTFMove(callback))
</ins><span class="cx"> , m_priority(s_observerPriority++)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -71,13 +71,8 @@
</span><span class="cx"> && ((options & CharacterData) || !(options & CharacterDataOldValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MutationObserver::observe(Node* node, const Dictionary& optionsDictionary, ExceptionCode& ec)
</del><ins>+void MutationObserver::observe(Node& node, const Dictionary& optionsDictionary, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!node) {
- ec = NOT_FOUND_ERR;
- return;
- }
-
</del><span class="cx"> static const struct {
</span><span class="cx"> const char* name;
</span><span class="cx"> MutationObserverOptions value;
</span><span class="lines">@@ -107,16 +102,16 @@
</span><span class="cx"> options |= CharacterData;
</span><span class="cx">
</span><span class="cx"> if (!validateOptions(options)) {
</span><del>- ec = SYNTAX_ERR;
</del><ins>+ ec = TypeError;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- node->registerMutationObserver(this, options, attributeFilter);
</del><ins>+ node.registerMutationObserver(this, options, attributeFilter);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<RefPtr<MutationRecord>> MutationObserver::takeRecords()
</del><ins>+Vector<Ref<MutationRecord>> MutationObserver::takeRecords()
</ins><span class="cx"> {
</span><del>- Vector<RefPtr<MutationRecord>> records;
</del><ins>+ Vector<Ref<MutationRecord>> records;
</ins><span class="cx"> records.swap(m_records);
</span><span class="cx"> return records;
</span><span class="cx"> }
</span><span class="lines">@@ -189,10 +184,10 @@
</span><span class="cx"> MicrotaskQueue::mainThreadQueue().append(WTFMove(microtask));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MutationObserver::enqueueMutationRecord(PassRefPtr<MutationRecord> mutation)
</del><ins>+void MutationObserver::enqueueMutationRecord(Ref<MutationRecord>&& mutation)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_records.append(mutation);
</del><ins>+ m_records.append(WTFMove(mutation));
</ins><span class="cx"> activeMutationObservers().add(this);
</span><span class="cx">
</span><span class="cx"> queueMutationObserverCompoundMicrotask();
</span><span class="lines">@@ -236,7 +231,7 @@
</span><span class="cx"> if (m_records.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Vector<RefPtr<MutationRecord>> records;
</del><ins>+ Vector<Ref<MutationRecord>> records;
</ins><span class="cx"> records.swap(m_records);
</span><span class="cx">
</span><span class="cx"> m_callback->call(records, this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.h (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.h 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationObserver.h 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -73,16 +73,16 @@
</span><span class="cx"> CharacterDataOldValue = 1 << 6,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static Ref<MutationObserver> create(PassRefPtr<MutationCallback>);
</del><ins>+ static Ref<MutationObserver> create(Ref<MutationCallback>&&);
</ins><span class="cx">
</span><span class="cx"> ~MutationObserver();
</span><span class="cx">
</span><del>- void observe(Node*, const Dictionary&, ExceptionCode&);
- Vector<RefPtr<MutationRecord>> takeRecords();
</del><ins>+ void observe(Node&, const Dictionary&, ExceptionCode&);
+ Vector<Ref<MutationRecord>> takeRecords();
</ins><span class="cx"> void disconnect();
</span><span class="cx"> void observationStarted(MutationObserverRegistration*);
</span><span class="cx"> void observationEnded(MutationObserverRegistration*);
</span><del>- void enqueueMutationRecord(PassRefPtr<MutationRecord>);
</del><ins>+ void enqueueMutationRecord(Ref<MutationRecord>&&);
</ins><span class="cx"> void setHasTransientRegistration();
</span><span class="cx"> bool canDeliver();
</span><span class="cx">
</span><span class="lines">@@ -91,14 +91,14 @@
</span><span class="cx"> private:
</span><span class="cx"> struct ObserverLessThan;
</span><span class="cx">
</span><del>- explicit MutationObserver(PassRefPtr<MutationCallback>);
</del><ins>+ explicit MutationObserver(Ref<MutationCallback>&&);
</ins><span class="cx"> void deliver();
</span><span class="cx">
</span><span class="cx"> static void deliverAllMutations();
</span><span class="cx"> static bool validateOptions(MutationObserverOptions);
</span><span class="cx">
</span><del>- RefPtr<MutationCallback> m_callback;
- Vector<RefPtr<MutationRecord>> m_records;
</del><ins>+ Ref<MutationCallback> m_callback;
+ Vector<Ref<MutationRecord>> m_records;
</ins><span class="cx"> HashSet<MutationObserverRegistration*> m_registrations;
</span><span class="cx"> unsigned m_priority;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserveridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.idl (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.idl 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationObserver.idl 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> [
</span><span class="cx"> CustomConstructor(MutationCallback callback),
</span><span class="cx"> CustomIsReachable,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface MutationObserver {
</span><span class="cx"> [RaisesException] void observe(Node target, Dictionary options);
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverInterestGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -64,23 +64,22 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MutationObserverInterestGroup::enqueueMutationRecord(PassRefPtr<MutationRecord> prpMutation)
</del><ins>+void MutationObserverInterestGroup::enqueueMutationRecord(Ref<MutationRecord>&& mutation)
</ins><span class="cx"> {
</span><del>- RefPtr<MutationRecord> mutation = prpMutation;
</del><span class="cx"> RefPtr<MutationRecord> mutationWithNullOldValue;
</span><span class="cx"> for (auto& observerOptionsPair : m_observers) {
</span><span class="cx"> MutationObserver* observer = observerOptionsPair.key;
</span><span class="cx"> if (hasOldValue(observerOptionsPair.value)) {
</span><del>- observer->enqueueMutationRecord(mutation);
</del><ins>+ observer->enqueueMutationRecord(mutation.copyRef());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (!mutationWithNullOldValue) {
</span><span class="cx"> if (mutation->oldValue().isNull())
</span><del>- mutationWithNullOldValue = mutation;
</del><ins>+ mutationWithNullOldValue = mutation.ptr();
</ins><span class="cx"> else
</span><del>- mutationWithNullOldValue = MutationRecord::createWithNullOldValue(*mutation).ptr();
</del><ins>+ mutationWithNullOldValue = MutationRecord::createWithNullOldValue(mutation).ptr();
</ins><span class="cx"> }
</span><del>- observer->enqueueMutationRecord(mutationWithNullOldValue);
</del><ins>+ observer->enqueueMutationRecord(*mutationWithNullOldValue);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverInterestGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverInterestGroup.h (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverInterestGroup.h 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationObserverInterestGroup.h 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isOldValueRequested();
</span><del>- void enqueueMutationRecord(PassRefPtr<MutationRecord>);
</del><ins>+ void enqueueMutationRecord(Ref<MutationRecord>&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static std::unique_ptr<MutationObserverInterestGroup> createIfNeeded(Node& target, MutationObserver::MutationType, MutationRecordDeliveryOptions oldValueFlag, const QualifiedName* attributeName = nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationRecord.cpp (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationRecord.cpp 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationRecord.cpp 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -42,12 +42,12 @@
</span><span class="cx">
</span><span class="cx"> class ChildListRecord : public MutationRecord {
</span><span class="cx"> public:
</span><del>- ChildListRecord(ContainerNode& target, PassRefPtr<NodeList> added, PassRefPtr<NodeList> removed, PassRefPtr<Node> previousSibling, PassRefPtr<Node> nextSibling)
</del><ins>+ ChildListRecord(ContainerNode& target, Ref<NodeList>&& added, Ref<NodeList>&& removed, RefPtr<Node>&& previousSibling, RefPtr<Node>&& nextSibling)
</ins><span class="cx"> : m_target(target)
</span><del>- , m_addedNodes(added)
- , m_removedNodes(removed)
- , m_previousSibling(previousSibling)
- , m_nextSibling(nextSibling)
</del><ins>+ , m_addedNodes(WTFMove(added))
+ , m_removedNodes(WTFMove(removed))
+ , m_previousSibling(WTFMove(previousSibling))
+ , m_nextSibling(WTFMove(nextSibling))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -164,9 +164,9 @@
</span><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span><del>-Ref<MutationRecord> MutationRecord::createChildList(ContainerNode& target, PassRefPtr<NodeList> added, PassRefPtr<NodeList> removed, PassRefPtr<Node> previousSibling, PassRefPtr<Node> nextSibling)
</del><ins>+Ref<MutationRecord> MutationRecord::createChildList(ContainerNode& target, Ref<NodeList>&& added, Ref<NodeList>&& removed, RefPtr<Node>&& previousSibling, RefPtr<Node>&& nextSibling)
</ins><span class="cx"> {
</span><del>- return adoptRef(static_cast<MutationRecord&>(*new ChildListRecord(target, added, removed, previousSibling, nextSibling)));
</del><ins>+ return adoptRef(static_cast<MutationRecord&>(*new ChildListRecord(target, WTFMove(added), WTFMove(removed), WTFMove(previousSibling), WTFMove(nextSibling))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<MutationRecord> MutationRecord::createAttributes(Element& target, const QualifiedName& name, const AtomicString& oldValue)
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationRecord.h (199877 => 199878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationRecord.h 2016-04-22 15:58:02 UTC (rev 199877)
+++ trunk/Source/WebCore/dom/MutationRecord.h 2016-04-22 15:59:10 UTC (rev 199878)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> class MutationRecord : public RefCounted<MutationRecord> {
</span><span class="cx"> public:
</span><del>- static Ref<MutationRecord> createChildList(ContainerNode& target, PassRefPtr<NodeList> added, PassRefPtr<NodeList> removed, PassRefPtr<Node> previousSibling, PassRefPtr<Node> nextSibling);
</del><ins>+ static Ref<MutationRecord> createChildList(ContainerNode& target, Ref<NodeList>&& added, Ref<NodeList>&& removed, RefPtr<Node>&& previousSibling, RefPtr<Node>&& nextSibling);
</ins><span class="cx"> static Ref<MutationRecord> createAttributes(Element& target, const QualifiedName&, const AtomicString& oldValue);
</span><span class="cx"> static Ref<MutationRecord> createCharacterData(CharacterData& target, const String& oldValue);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>