<!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>[207791] trunk/Source</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/207791">207791</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 17:16:29 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce special handling for typed arrays in JSDOMConvert.h
https://bugs.webkit.org/show_bug.cgi?id=163907
Reviewed by Sam Weinig.
Reduce special handling for typed arrays in JSDOMConvert.h by adding a toWrapped() static
function on JSGenericTypedArrayView, similarly to other wrapper types.
Source/JavaScriptCore:
* runtime/JSGenericTypedArrayView.h:
(JSC::JSGenericTypedArrayView::typedImpl):
(JSC::JSGenericTypedArrayView<Adaptor>::toWrapped):
Source/WebCore:
No new tests, no web-exposed behavior change.
* bindings/js/JSDOMConvert.h:
(WebCore::Converter<IDLInterface<JSC::GenericTypedArrayView<Adaptor>>>::convert): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207790 => 207791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 00:11:38 UTC (rev 207790)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 00:16:29 UTC (rev 207791)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-24 Chris Dumez <cdumez@apple.com>
+
+ Reduce special handling for typed arrays in JSDOMConvert.h
+ https://bugs.webkit.org/show_bug.cgi?id=163907
+
+ Reviewed by Sam Weinig.
+
+ Reduce special handling for typed arrays in JSDOMConvert.h by adding a toWrapped() static
+ function on JSGenericTypedArrayView, similarly to other wrapper types.
+
+ * runtime/JSGenericTypedArrayView.h:
+ (JSC::JSGenericTypedArrayView::typedImpl):
+ (JSC::JSGenericTypedArrayView<Adaptor>::toWrapped):
+
</ins><span class="cx"> 2016-10-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT][DFG] CallDOM never writes Stack
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h (207790 => 207791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h 2016-10-25 00:11:38 UTC (rev 207790)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h 2016-10-25 00:16:29 UTC (rev 207791)
</span><span class="lines">@@ -225,10 +225,12 @@
</span><span class="cx"> // then it will have thrown an exception.
</span><span class="cx"> bool set(ExecState*, unsigned offset, JSObject*, unsigned objectOffset, unsigned length, CopyType type = CopyType::Unobservable);
</span><span class="cx">
</span><del>- PassRefPtr<typename Adaptor::ViewType> typedImpl()
</del><ins>+ RefPtr<typename Adaptor::ViewType> typedImpl()
</ins><span class="cx"> {
</span><span class="cx"> return Adaptor::ViewType::create(buffer(), byteOffset(), length());
</span><span class="cx"> }
</span><ins>+
+ static RefPtr<typename Adaptor::ViewType> toWrapped(JSValue);
</ins><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</span><span class="cx"> {
</span><span class="lines">@@ -367,4 +369,10 @@
</span><span class="cx"> return wrapper->typedImpl();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename Adaptor>
+RefPtr<typename Adaptor::ViewType> JSGenericTypedArrayView<Adaptor>::toWrapped(JSValue value)
+{
+ return JSC::toNativeTypedView<Adaptor>(value);
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207790 => 207791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 00:11:38 UTC (rev 207790)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 00:16:29 UTC (rev 207791)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-24 Chris Dumez <cdumez@apple.com>
+
+ Reduce special handling for typed arrays in JSDOMConvert.h
+ https://bugs.webkit.org/show_bug.cgi?id=163907
+
+ Reviewed by Sam Weinig.
+
+ Reduce special handling for typed arrays in JSDOMConvert.h by adding a toWrapped() static
+ function on JSGenericTypedArrayView, similarly to other wrapper types.
+
+ No new tests, no web-exposed behavior change.
+
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::Converter<IDLInterface<JSC::GenericTypedArrayView<Adaptor>>>::convert): Deleted.
+
</ins><span class="cx"> 2016-10-24 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207783.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (207790 => 207791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-25 00:11:38 UTC (rev 207790)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-25 00:16:29 UTC (rev 207791)
</span><span class="lines">@@ -235,6 +235,12 @@
</span><span class="cx"> using ToWrappedReturnType = RefPtr<ArrayBufferView>;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// Typed arrays support.
+template<typename Adaptor> struct JSDOMWrapperConverterTraits<JSC::GenericTypedArrayView<Adaptor>> {
+ using WrapperClass = JSC::JSGenericTypedArrayView<Adaptor>;
+ using ToWrappedReturnType = RefPtr<JSC::GenericTypedArrayView<Adaptor>>;
+};
+
</ins><span class="cx"> // MARK: -
</span><span class="cx"> // MARK: Interface type
</span><span class="cx">
</span><span class="lines">@@ -264,27 +270,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// Typed arrays support.
-
-template<typename Adaptor> struct IDLInterface<JSC::GenericTypedArrayView<Adaptor>> : IDLType<Ref<JSC::GenericTypedArrayView<Adaptor>>> {
- using RawType = JSC::GenericTypedArrayView<Adaptor>;
- using NullableType = RefPtr<JSC::GenericTypedArrayView<Adaptor>>;
-};
-
-template<typename Adaptor> struct Converter<IDLInterface<JSC::GenericTypedArrayView<Adaptor>>> : DefaultConverter<IDLInterface<JSC::GenericTypedArrayView<Adaptor>>> {
- using ReturnType = RefPtr<JSC::GenericTypedArrayView<Adaptor>>;
-
- static ReturnType convert(JSC::ExecState& state, JSC::JSValue value)
- {
- JSC::VM& vm = state.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
- ReturnType object = JSC::toNativeTypedView<Adaptor>(value);
- if (!object)
- throwTypeError(&state, scope);
- return object;
- }
-};
-
</del><span class="cx"> // MARK: -
</span><span class="cx"> // MARK: Any type
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>