<!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>[244926] trunk/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/244926">244926</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2019-05-03 15:01:13 -0700 (Fri, 03 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use WeakPtr for JSLazyEventListener::m_originalNode for safety
https://bugs.webkit.org/show_bug.cgi?id=197576
<rdar://problem/24314027>

Reviewed by Alex Christensen.

* bindings/js/JSLazyEventListener.cpp:
(WebCore::JSLazyEventListener::JSLazyEventListener):
(WebCore::JSLazyEventListener::create):
* bindings/js/JSLazyEventListener.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLazyEventListenercpp">trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLazyEventListenerh">trunk/Source/WebCore/bindings/js/JSLazyEventListener.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244925 => 244926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-03 22:00:26 UTC (rev 244925)
+++ trunk/Source/WebCore/ChangeLog      2019-05-03 22:01:13 UTC (rev 244926)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-05-03  Chris Dumez  <cdumez@apple.com>
+
+        Use WeakPtr for JSLazyEventListener::m_originalNode for safety
+        https://bugs.webkit.org/show_bug.cgi?id=197576
+        <rdar://problem/24314027>
+
+        Reviewed by Alex Christensen.
+
+        * bindings/js/JSLazyEventListener.cpp:
+        (WebCore::JSLazyEventListener::JSLazyEventListener):
+        (WebCore::JSLazyEventListener::create):
+        * bindings/js/JSLazyEventListener.h:
+
</ins><span class="cx"> 2019-05-03  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         AVFoundation framework isn't always installed
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLazyEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp (244925 => 244926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp 2019-05-03 22:00:26 UTC (rev 244925)
+++ trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp    2019-05-03 22:01:13 UTC (rev 244926)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -43,7 +44,7 @@
</span><span class="cx">     const QualifiedName& attributeName;
</span><span class="cx">     const AtomicString& attributeValue;
</span><span class="cx">     Document& document;
</span><del>-    ContainerNode* node;
</del><ins>+    WeakPtr<ContainerNode> node;
</ins><span class="cx">     JSObject* wrapper;
</span><span class="cx">     bool shouldUseSVGEventName;
</span><span class="cx"> };
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx">     return position;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSLazyEventListener::JSLazyEventListener(const CreationArguments& arguments, const String& sourceURL, const TextPosition& sourcePosition)
</del><ins>+JSLazyEventListener::JSLazyEventListener(CreationArguments&& arguments, const String& sourceURL, const TextPosition& sourcePosition)
</ins><span class="cx">     : JSEventListener(nullptr, arguments.wrapper, true, mainThreadNormalWorld())
</span><span class="cx">     , m_functionName(arguments.attributeName.localName().string())
</span><span class="cx">     , m_eventParameterName(eventParameterName(arguments.shouldUseSVGEventName))
</span><span class="lines">@@ -71,14 +72,8 @@
</span><span class="cx">     , m_code(arguments.attributeValue)
</span><span class="cx">     , m_sourceURL(sourceURL)
</span><span class="cx">     , m_sourcePosition(convertZeroToOne(sourcePosition))
</span><del>-    , m_originalNode(arguments.node)
</del><ins>+    , m_originalNode(WTFMove(arguments.node))
</ins><span class="cx"> {
</span><del>-    // We don't ref m_originalNode because we assume it will stay alive as long as this
-    // handler object is around and we need to avoid a reference cycle. If JS transfers
-    // this handler to another node, initializeJSFunction will be called and after that
-    // m_originalNode will never be looked at again.
-    // FIXME: Doesn't seem clear that is guaranteed to be true in the general case.
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     eventListenerCounter.increment();
</span><span class="cx"> #endif
</span><span class="lines">@@ -159,7 +154,7 @@
</span><span class="cx">     return jsFunction;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr<JSLazyEventListener> JSLazyEventListener::create(const CreationArguments& arguments)
</del><ins>+RefPtr<JSLazyEventListener> JSLazyEventListener::create(CreationArguments&& arguments)
</ins><span class="cx"> {
</span><span class="cx">     if (arguments.attributeValue.isNull())
</span><span class="cx">         return nullptr;
</span><span class="lines">@@ -174,12 +169,12 @@
</span><span class="cx">         sourceURL = arguments.document.url().string();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return adoptRef(*new JSLazyEventListener(arguments, sourceURL, position));
</del><ins>+    return adoptRef(*new JSLazyEventListener(WTFMove(arguments), sourceURL, position));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RefPtr<JSLazyEventListener> JSLazyEventListener::create(Element& element, const QualifiedName& attributeName, const AtomicString& attributeValue)
</span><span class="cx"> {
</span><del>-    return create({ attributeName, attributeValue, element.document(), &element, nullptr, element.isSVGElement() });
</del><ins>+    return create({ attributeName, attributeValue, element.document(), makeWeakPtr(element), nullptr, element.isSVGElement() });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RefPtr<JSLazyEventListener> JSLazyEventListener::create(Document& document, const QualifiedName& attributeName, const AtomicString& attributeValue)
</span><span class="lines">@@ -186,7 +181,7 @@
</span><span class="cx"> {
</span><span class="cx">     // FIXME: This always passes false for "shouldUseSVGEventName". Is that correct for events dispatched to SVG documents?
</span><span class="cx">     // This has been this way for a long time, but became more obvious when refactoring to separate the Element and Document code paths.
</span><del>-    return create({ attributeName, attributeValue, document, &document, nullptr, false });
</del><ins>+    return create({ attributeName, attributeValue, document, makeWeakPtr(document), nullptr, false });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RefPtr<JSLazyEventListener> JSLazyEventListener::create(DOMWindow& window, const QualifiedName& attributeName, const AtomicString& attributeValue)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLazyEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLazyEventListener.h (244925 => 244926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLazyEventListener.h   2019-05-03 22:00:26 UTC (rev 244925)
+++ trunk/Source/WebCore/bindings/js/JSLazyEventListener.h      2019-05-03 22:01:13 UTC (rev 244926)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "JSEventListener.h"
</span><ins>+#include <wtf/Forward.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -42,8 +43,8 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     struct CreationArguments;
</span><del>-    static RefPtr<JSLazyEventListener> create(const CreationArguments&);
-    JSLazyEventListener(const CreationArguments&, const String& sourceURL, const TextPosition&);
</del><ins>+    static RefPtr<JSLazyEventListener> create(CreationArguments&&);
+    JSLazyEventListener(CreationArguments&&, const String& sourceURL, const TextPosition&);
</ins><span class="cx"> 
</span><span class="cx">     JSC::JSObject* initializeJSFunction(ScriptExecutionContext&) const final;
</span><span class="cx">     bool wasCreatedFromMarkup() const final { return true; }
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx">     String m_code;
</span><span class="cx">     String m_sourceURL;
</span><span class="cx">     TextPosition m_sourcePosition;
</span><del>-    ContainerNode* m_originalNode;
</del><ins>+    WeakPtr<ContainerNode> m_originalNode;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>