<!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>[211106] branches/safari-603-branch</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/211106">211106</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-24 13:22:59 -0800 (Tue, 24 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211065">r211065</a>. rdar://problem/29784295</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeJSArrayBufferViewInlinesh">branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayBufferViewInlines.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsjssharedarraybufferwebglexpectedtxt">branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsjssharedarraybufferwebglhtml">branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211105 => 211106)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-24 21:22:56 UTC (rev 211105)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-24 21:22:59 UTC (rev 211106)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211065. rdar://problem/29784295
+
+ 2017-01-23 Filip Pizlo <fpizlo@apple.com>
+
+ SharedArrayBuffer plus WebGL should not equal CRASH
+ https://bugs.webkit.org/show_bug.cgi?id=167329
+
+ Reviewed by Saam Barati.
+
+ This test used to crash and now it doesn't. It throws some exception.
+
+ * js/shared-array-buffer-webgl-expected.txt: Added.
+ * js/shared-array-buffer-webgl.html: Added.
+
+2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211007. rdar://problem/28620919
</span><span class="cx">
</span><span class="cx"> 2017-01-20 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsjssharedarraybufferwebglexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl-expected.txt (0 => 211106)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl-expected.txt 2017-01-24 21:22:59 UTC (rev 211106)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Test that passing a SharedArrayBuffer to WebGL does not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsjssharedarraybufferwebglhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl.html (0 => 211106)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/js/shared-array-buffer-webgl.html 2017-01-24 21:22:59 UTC (rev 211106)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<canvas id="canvas"></canvas>
+<script>
+description('Test that passing a SharedArrayBuffer to WebGL does not crash.')
+
+var canvas = document.getElementById("canvas");
+var gl = canvas.getContext("webgl");
+var texture = gl.createTexture();
+
+var ext = (
+ gl.getExtension("WEBGL_compressed_texture_s3tc") ||
+ gl.getExtension("MOZ_WEBGL_compressed_texture_s3tc") ||
+ gl.getExtension("WEBKIT_WEBGL_compressed_texture_s3tc")
+);
+
+var data = new SharedArrayBuffer(1024);
+var view = new Uint8Array(data);
+
+try {
+ var texture = gl.createTexture();
+ gl.bindTexture(gl.TEXTURE_2D, texture);
+ gl.compressedTexImage2D(gl.TEXTURE_2D, 0, ext.COMPRESSED_RGBA_S3TC_DXT5_EXT, 512, 512, 0, view);
+} catch (e) { } // This shouldn't crash.
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (211105 => 211106)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-24 21:22:56 UTC (rev 211105)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-24 21:22:59 UTC (rev 211106)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211065. rdar://problem/29784295
+
+ 2017-01-23 Filip Pizlo <fpizlo@apple.com>
+
+ SharedArrayBuffer plus WebGL should not equal CRASH
+ https://bugs.webkit.org/show_bug.cgi?id=167329
+
+ Reviewed by Saam Barati.
+
+ DOM unwrapping methods should return null rather than crashing. The code expects an
+ unshared buffer, so we should return null when it's shared. The caller can then decide
+ if they like null or not.
+
+ * runtime/JSArrayBufferViewInlines.h:
+ (JSC::JSArrayBufferView::toWrapped):
+
+2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211043. rdar://problem/30134434
</span><span class="cx">
</span><span class="cx"> 2017-01-23 Michael Saboff <msaboff@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeJSArrayBufferViewInlinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayBufferViewInlines.h (211105 => 211106)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayBufferViewInlines.h 2017-01-24 21:22:56 UTC (rev 211105)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayBufferViewInlines.h 2017-01-24 21:22:59 UTC (rev 211106)
</span><span class="lines">@@ -91,8 +91,10 @@
</span><span class="cx">
</span><span class="cx"> inline RefPtr<ArrayBufferView> JSArrayBufferView::toWrapped(JSValue value)
</span><span class="cx"> {
</span><del>- if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(value))
- return view->unsharedImpl();
</del><ins>+ if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(value)) {
+ if (!view->isShared())
+ return view->unsharedImpl();
+ }
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>