<!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>[284549] 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/284549">284549</a></dd>
<dt>Author</dt> <dd>sihui_liu@apple.com</dd>
<dt>Date</dt> <dd>2021-10-20 10:51:29 -0700 (Wed, 20 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Share code between JSDOMIterator and JSDOMAsyncIterator
https://bugs.webkit.org/show_bug.cgi?id=231437
<rdar://problem/84306323>

Reviewed by Youenn Fablet.

* bindings/js/JSDOMAsyncIterator.h:
(WebCore::jsPair): Deleted.
(WebCore::iteratorCreate): Deleted.
* bindings/js/JSFileSystemDirectoryHandleIterator.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMAsyncIteratorh">trunk/Source/WebCore/bindings/js/JSDOMAsyncIterator.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSFileSystemDirectoryHandleIteratorh">trunk/Source/WebCore/bindings/js/JSFileSystemDirectoryHandleIterator.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (284548 => 284549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-20 17:35:18 UTC (rev 284548)
+++ trunk/Source/WebCore/ChangeLog      2021-10-20 17:51:29 UTC (rev 284549)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-10-20  Sihui Liu  <sihui_liu@apple.com>
+
+        Share code between JSDOMIterator and JSDOMAsyncIterator
+        https://bugs.webkit.org/show_bug.cgi?id=231437
+        <rdar://problem/84306323>
+
+        Reviewed by Youenn Fablet.
+
+        * bindings/js/JSDOMAsyncIterator.h:
+        (WebCore::jsPair): Deleted.
+        (WebCore::iteratorCreate): Deleted.
+        * bindings/js/JSFileSystemDirectoryHandleIterator.h:
+
</ins><span class="cx"> 2021-10-20  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Fix percentages on orthogonal replaced children
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMAsyncIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMAsyncIterator.h (284548 => 284549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMAsyncIterator.h    2021-10-20 17:35:18 UTC (rev 284548)
+++ trunk/Source/WebCore/bindings/js/JSDOMAsyncIterator.h       2021-10-20 17:51:29 UTC (rev 284549)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "JSDOMConvert.h"
</span><ins>+#include "JSDOMIterator.h"
</ins><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "JSDOMPromiseDeferred.h"
</span><span class="cx"> #include <JavaScriptCore/AsyncIteratorPrototype.h>
</span><span class="lines">@@ -37,19 +38,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-void addValueIterableMethods(JSC::JSGlobalObject&, JSC::JSObject&);
-
-enum class JSDOMAsyncIteratorType { Set, Map };
-
-// struct IteratorTraits {
-//     static constexpr JSDOMAsyncIteratorType type = [Map|Set];
-//     using KeyType = [IDLType|void];
-//     using ValueType = [IDLType];
-// };
-
-template<typename T, typename U = void> using EnableIfMap = typename std::enable_if<T::type == JSDOMAsyncIteratorType::Map, U>::type;
-template<typename T, typename U = void> using EnableIfSet = typename std::enable_if<T::type == JSDOMAsyncIteratorType::Set, U>::type;
-
</del><span class="cx"> // https://webidl.spec.whatwg.org/#es-asynchronous-iterator-prototype-object
</span><span class="cx"> template<typename JSWrapper, typename IteratorTraits, typename JSIterator> class JSDOMAsyncIteratorPrototype final : public JSC::JSNonFinalObject {
</span><span class="cx"> public:
</span><span class="lines">@@ -89,8 +77,6 @@
</span><span class="cx">     void finishCreation(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-using IterationKind = JSC::IterationKind;
-
</del><span class="cx"> template<typename JSWrapper, typename IteratorTraits, typename JSIterator> class JSDOMAsyncIteratorBase : public JSDOMObject {
</span><span class="cx"> public:
</span><span class="cx">     using Base = JSDOMObject;
</span><span class="lines">@@ -132,30 +118,6 @@
</span><span class="cx">     RefPtr<DOMPromise> m_ongoingPromise;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-inline JSC::JSValue jsPair(JSC::JSGlobalObject&, JSDOMGlobalObject& globalObject, JSC::JSValue value1, JSC::JSValue value2)
-{
-    JSC::MarkedArgumentBuffer arguments;
-    arguments.append(value1);
-    arguments.append(value2);
-    ASSERT(!arguments.hasOverflowed());
-    return constructArray(&globalObject, static_cast<JSC::ArrayAllocationProfile*>(nullptr), arguments);
-}
-
-template<typename FirstType, typename SecondType, typename T, typename U>
-inline JSC::JSValue jsPair(JSC::JSGlobalObject& lexicalGlobalObject, JSDOMGlobalObject& globalObject, const T& value1, const U& value2)
-{
-    return jsPair(lexicalGlobalObject, globalObject, toJS<FirstType>(lexicalGlobalObject, globalObject, value1), toJS<SecondType>(lexicalGlobalObject, globalObject, value2));
-}
-
-template<typename JSIterator> JSC::JSValue iteratorCreate(typename JSIterator::Wrapper&, IterationKind);
-
-template<typename JSIterator> JSC::JSValue iteratorCreate(typename JSIterator::Wrapper& thisObject, IterationKind kind)
-{
-    ASSERT(thisObject.globalObject());
-    JSDOMGlobalObject& globalObject = *thisObject.globalObject();
-    return JSIterator::create(globalObject.vm(), getDOMStructure<JSIterator>(globalObject.vm(), globalObject), thisObject, kind);
-}
-
</del><span class="cx"> template<typename IteratorValue, typename IteratorTraits>
</span><span class="cx"> inline EnableIfMap<IteratorTraits, JSC::JSValue> convertToJS(JSC::JSGlobalObject& globalObject, JSDOMGlobalObject& domGlobalObject, IteratorValue& value, IteratorTraits, IterationKind kind)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFileSystemDirectoryHandleIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFileSystemDirectoryHandleIterator.h (284548 => 284549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFileSystemDirectoryHandleIterator.h   2021-10-20 17:35:18 UTC (rev 284548)
+++ trunk/Source/WebCore/bindings/js/JSFileSystemDirectoryHandleIterator.h      2021-10-20 17:51:29 UTC (rev 284549)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> class FileSystemHandle;
</span><span class="cx"> 
</span><span class="cx"> struct JSFileSystemDirectoryHandleIteratorTraits {
</span><del>-    static constexpr JSDOMAsyncIteratorType type = JSDOMAsyncIteratorType::Map;
</del><ins>+    static constexpr JSDOMIteratorType type = JSDOMIteratorType::Map;
</ins><span class="cx">     using KeyType = IDLByteString;
</span><span class="cx">     using ValueType = IDLInterface<FileSystemHandle>;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>