<!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>[248267] 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/248267">248267</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-08-04 23:54:07 -0700 (Sun, 04 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebRTC: got incorrect `this` in negotiationneeded event
https://bugs.webkit.org/show_bug.cgi?id=200427

Reviewed by Darin Adler.

Source/WebCore:

Make sure a dom object created through a JS built-in constructor is added to the wrapper cache.

Test: webrtc/onnegotiationneeded.html

* bindings/js/JSDOMBuiltinConstructor.h:
(WebCore::createJSObjectFromWrapper):
(WebCore::createJSObject):

LayoutTests:

* webrtc/onnegotiationneeded-expected.txt: Added.
* webrtc/onnegotiationneeded.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBuiltinConstructorh">trunk/Source/WebCore/bindings/js/JSDOMBuiltinConstructor.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtconnegotiationneededexpectedtxt">trunk/LayoutTests/webrtc/onnegotiationneeded-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtconnegotiationneededhtml">trunk/LayoutTests/webrtc/onnegotiationneeded.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (248266 => 248267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-08-05 03:26:33 UTC (rev 248266)
+++ trunk/LayoutTests/ChangeLog 2019-08-05 06:54:07 UTC (rev 248267)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-08-04  Youenn Fablet  <youenn@apple.com>
+
+        WebRTC: got incorrect `this` in negotiationneeded event
+        https://bugs.webkit.org/show_bug.cgi?id=200427
+
+        Reviewed by Darin Adler.
+
+        * webrtc/onnegotiationneeded-expected.txt: Added.
+        * webrtc/onnegotiationneeded.html: Added.
+
</ins><span class="cx"> 2019-08-04  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Ping loads should not prevent page caching
</span></span></pre></div>
<a id="trunkLayoutTestswebrtconnegotiationneededexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/onnegotiationneeded-expected.txt (0 => 248267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/onnegotiationneeded-expected.txt                                (rev 0)
+++ trunk/LayoutTests/webrtc/onnegotiationneeded-expected.txt   2019-08-05 06:54:07 UTC (rev 248267)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Make sure event target is the connection 
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtconnegotiationneededhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/onnegotiationneeded.html (0 => 248267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/onnegotiationneeded.html                                (rev 0)
+++ trunk/LayoutTests/webrtc/onnegotiationneeded.html   2019-08-05 06:54:07 UTC (rev 248267)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Testing onnegotiationneeded</title>
+        <script src="../resources/testharness.js"></script>
+        <script src="../resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+promise_test(() => {
+    let done;
+    const promise = new Promise(resolve => done = resolve);
+
+    const pc = new RTCPeerConnection();
+    pc.onnegotiationneeded = function(e) {
+        assert_equals(pc, this);
+        done();
+    }
+    pc.createDataChannel('x');
+    return promise;
+}, "Make sure event target is the connection");
+        </script>
+    </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248266 => 248267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-05 03:26:33 UTC (rev 248266)
+++ trunk/Source/WebCore/ChangeLog      2019-08-05 06:54:07 UTC (rev 248267)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-08-04  Youenn Fablet  <youenn@apple.com>
+
+        WebRTC: got incorrect `this` in negotiationneeded event
+        https://bugs.webkit.org/show_bug.cgi?id=200427
+
+        Reviewed by Darin Adler.
+
+        Make sure a dom object created through a JS built-in constructor is added to the wrapper cache.
+
+        Test: webrtc/onnegotiationneeded.html
+
+        * bindings/js/JSDOMBuiltinConstructor.h:
+        (WebCore::createJSObjectFromWrapper):
+        (WebCore::createJSObject):
+
</ins><span class="cx"> 2019-08-04  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Mangled WHLSL names don't need to allocate Strings
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBuiltinConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBuiltinConstructor.h (248266 => 248267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBuiltinConstructor.h       2019-08-05 03:26:33 UTC (rev 248266)
+++ trunk/Source/WebCore/bindings/js/JSDOMBuiltinConstructor.h  2019-08-05 06:54:07 UTC (rev 248267)
</span><span class="lines">@@ -91,14 +91,13 @@
</span><span class="cx">     return callConstructor(state, *object);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<typename JSClass> inline
</del><ins>+template<typename JSClass>
</ins><span class="cx"> typename std::enable_if<JSDOMObjectInspector<JSClass>::isSimpleWrapper, JSC::JSObject&>::type createJSObject(JSDOMBuiltinConstructor<JSClass>& constructor)
</span><span class="cx"> {
</span><del>-    auto& globalObject = *constructor.globalObject();
-    return *JSClass::create(getDOMStructure<JSClass>(globalObject.vm(), globalObject), &globalObject, JSClass::DOMWrapped::create());
</del><ins>+    return *createWrapper<typename JSClass::DOMWrapped>(constructor.globalObject(), JSClass::DOMWrapped::create());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<typename JSClass> inline
</del><ins>+template<typename JSClass>
</ins><span class="cx"> typename std::enable_if<JSDOMObjectInspector<JSClass>::isBuiltin, JSC::JSObject&>::type createJSObject(JSDOMBuiltinConstructor<JSClass>& constructor)
</span><span class="cx"> {
</span><span class="cx">     auto& globalObject = *constructor.globalObject();
</span><span class="lines">@@ -105,14 +104,11 @@
</span><span class="cx">     return *JSClass::create(getDOMStructure<JSClass>(globalObject.vm(), globalObject), &globalObject);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<typename JSClass> inline
</del><ins>+template<typename JSClass>
</ins><span class="cx"> typename std::enable_if<JSDOMObjectInspector<JSClass>::isComplexWrapper, JSC::JSObject*>::type createJSObject(JSDOMBuiltinConstructor<JSClass>& constructor)
</span><span class="cx"> {
</span><del>-    ScriptExecutionContext* context = constructor.scriptExecutionContext();
-    if (!context)
-        return nullptr;
-    auto& globalObject = *constructor.globalObject();
-    return JSClass::create(getDOMStructure<JSClass>(globalObject.vm(), globalObject), &globalObject, JSClass::DOMWrapped::create(*context));
</del><ins>+    auto* context = constructor.scriptExecutionContext();
+    return context ? createWrapper<typename JSClass::DOMWrapped>(constructor.globalObject(), JSClass::DOMWrapped::create(*context)) : nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<typename JSClass> inline JSC::EncodedJSValue JSC_HOST_CALL JSDOMBuiltinConstructor<JSClass>::construct(JSC::ExecState* state)
</span></span></pre>
</div>
</div>

</body>
</html>