<!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>[196170] 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/196170">196170</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-02-05 01:59:15 -0800 (Fri, 05 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove DOMWrapped parameter from JSKeyValueIterator
https://bugs.webkit.org/show_bug.cgi?id=153859
Reviewed by Sam Weinig.
No change in behavior.
Using std::declval to infer DOMWrapped from JSWrapper::wrapped.
* bindings/js/JSFetchHeadersCustom.cpp:
(WebCore::JSFetchHeaders::entries):
(WebCore::JSFetchHeaders::keys):
(WebCore::JSFetchHeaders::values):
* bindings/js/JSKeyValueIterator.h:
(WebCore::createIterator):
(WebCore::JSKeyValueIterator<JSWrapper>::destroy):
(WebCore::JSKeyValueIterator<JSWrapper>::next):
(WebCore::JSKeyValueIteratorPrototypeFunctionNext):
(WebCore::JSKeyValueIteratorPrototype<JSWrapper>::finishCreation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSFetchHeadersCustomcpp">trunk/Source/WebCore/bindings/js/JSFetchHeadersCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSKeyValueIteratorh">trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196169 => 196170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-05 09:03:28 UTC (rev 196169)
+++ trunk/Source/WebCore/ChangeLog 2016-02-05 09:59:15 UTC (rev 196170)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-02-05 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Remove DOMWrapped parameter from JSKeyValueIterator
+ https://bugs.webkit.org/show_bug.cgi?id=153859
+
+ Reviewed by Sam Weinig.
+
+ No change in behavior.
+
+ Using std::declval to infer DOMWrapped from JSWrapper::wrapped.
+
+ * bindings/js/JSFetchHeadersCustom.cpp:
+ (WebCore::JSFetchHeaders::entries):
+ (WebCore::JSFetchHeaders::keys):
+ (WebCore::JSFetchHeaders::values):
+ * bindings/js/JSKeyValueIterator.h:
+ (WebCore::createIterator):
+ (WebCore::JSKeyValueIterator<JSWrapper>::destroy):
+ (WebCore::JSKeyValueIterator<JSWrapper>::next):
+ (WebCore::JSKeyValueIteratorPrototypeFunctionNext):
+ (WebCore::JSKeyValueIteratorPrototype<JSWrapper>::finishCreation):
+
</ins><span class="cx"> 2016-02-05 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WebKit hanging when VoiceOver attempts to focus in on page
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFetchHeadersCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFetchHeadersCustom.cpp (196169 => 196170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFetchHeadersCustom.cpp 2016-02-05 09:03:28 UTC (rev 196169)
+++ trunk/Source/WebCore/bindings/js/JSFetchHeadersCustom.cpp 2016-02-05 09:59:15 UTC (rev 196170)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // FIXME: Move this code to JSFetchHeaders.
</span><del>-using FetchHeadersIterator = JSKeyValueIterator<JSFetchHeaders, FetchHeaders>;
-using FetchHeadersIteratorPrototype = JSKeyValueIteratorPrototype<JSFetchHeaders, FetchHeaders>;
</del><ins>+using FetchHeadersIterator = JSKeyValueIterator<JSFetchHeaders>;
+using FetchHeadersIteratorPrototype = JSKeyValueIteratorPrototype<JSFetchHeaders>;
</ins><span class="cx">
</span><span class="cx"> template<>
</span><span class="cx"> const JSC::ClassInfo FetchHeadersIterator::s_info = { "Headers Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(FetchHeadersIterator) };
</span><span class="lines">@@ -47,17 +47,17 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue JSFetchHeaders::entries(JSC::ExecState&)
</span><span class="cx"> {
</span><del>- return createIterator<JSFetchHeaders, FetchHeaders>(*globalObject(), *this, IterationKind::KeyValue);
</del><ins>+ return createIterator<JSFetchHeaders>(*globalObject(), *this, IterationKind::KeyValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue JSFetchHeaders::keys(JSC::ExecState&)
</span><span class="cx"> {
</span><del>- return createIterator<JSFetchHeaders, FetchHeaders>(*globalObject(), *this, IterationKind::Key);
</del><ins>+ return createIterator<JSFetchHeaders>(*globalObject(), *this, IterationKind::Key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue JSFetchHeaders::values(JSC::ExecState&)
</span><span class="cx"> {
</span><del>- return createIterator<JSFetchHeaders, FetchHeaders>(*globalObject(), *this, IterationKind::Value);
</del><ins>+ return createIterator<JSFetchHeaders>(*globalObject(), *this, IterationKind::Value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSKeyValueIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h (196169 => 196170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h 2016-02-05 09:03:28 UTC (rev 196169)
+++ trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h 2016-02-05 09:59:15 UTC (rev 196170)
</span><span class="lines">@@ -28,14 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include <runtime/JSDestructibleObject.h>
</span><ins>+#include <type_traits>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: Update binding generator to allow getting DOMWrapped from JSWrapper.
-template<typename JSWrapper, typename DOMWrapped>
</del><ins>+template<typename JSWrapper>
</ins><span class="cx"> class JSKeyValueIteratorPrototype : public JSC::JSNonFinalObject {
</span><span class="cx"> public:
</span><del>- typedef JSC::JSNonFinalObject Base;
</del><ins>+ using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
+ using Base = JSC::JSNonFinalObject;
</ins><span class="cx">
</span><span class="cx"> static JSKeyValueIteratorPrototype* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
</span><span class="cx"> {
</span><span class="lines">@@ -61,10 +62,11 @@
</span><span class="cx">
</span><span class="cx"> enum class IterationKind { Key, Value, KeyValue };
</span><span class="cx">
</span><del>-template<typename JSWrapper, typename DOMWrapped>
</del><ins>+template<typename JSWrapper>
</ins><span class="cx"> class JSKeyValueIterator: public JSDOMObject {
</span><span class="cx"> public:
</span><del>- typedef JSDOMObject Base;
</del><ins>+ using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
+ using Base = JSDOMObject;
</ins><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="lines">@@ -80,10 +82,10 @@
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</del><ins>+ static JSKeyValueIteratorPrototype<JSWrapper>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</ins><span class="cx"> {
</span><del>- return JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::create(vm, globalObject,
- JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::createStructure(vm, globalObject, globalObject->objectPrototype()));
</del><ins>+ return JSKeyValueIteratorPrototype<JSWrapper>::create(vm, globalObject,
+ JSKeyValueIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->objectPrototype()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool next(JSC::ExecState&, JSC::JSValue&);
</span><span class="lines">@@ -102,21 +104,21 @@
</span><span class="cx"> IterationKind m_kind;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename JSWrapper, typename DOMWrapped>
-JSKeyValueIterator<JSWrapper, DOMWrapped>* createIterator(JSDOMGlobalObject& globalObject, JSWrapper& wrapper, IterationKind kind)
</del><ins>+template<typename JSWrapper>
+JSKeyValueIterator<JSWrapper>* createIterator(JSDOMGlobalObject& globalObject, JSWrapper& wrapper, IterationKind kind)
</ins><span class="cx"> {
</span><del>- return JSKeyValueIterator<JSWrapper, DOMWrapped>::create(globalObject.vm(), getDOMStructure<JSKeyValueIterator<JSWrapper, DOMWrapped>>(globalObject.vm(), globalObject), wrapper, kind);
</del><ins>+ return JSKeyValueIterator<JSWrapper>::create(globalObject.vm(), getDOMStructure<JSKeyValueIterator<JSWrapper>>(globalObject.vm(), globalObject), wrapper, kind);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper, typename DOMWrapped>
-void JSKeyValueIterator<JSWrapper, DOMWrapped>::destroy(JSCell* cell)
</del><ins>+template<typename JSWrapper>
+void JSKeyValueIterator<JSWrapper>::destroy(JSCell* cell)
</ins><span class="cx"> {
</span><del>- JSKeyValueIterator<JSWrapper, DOMWrapped>* thisObject = JSC::jsCast<JSKeyValueIterator<JSWrapper, DOMWrapped>*>(cell);
- thisObject->JSKeyValueIterator<JSWrapper, DOMWrapped>::~JSKeyValueIterator();
</del><ins>+ JSKeyValueIterator<JSWrapper>* thisObject = JSC::jsCast<JSKeyValueIterator<JSWrapper>*>(cell);
+ thisObject->JSKeyValueIterator<JSWrapper>::~JSKeyValueIterator();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper, typename DOMWrapped>
-bool JSKeyValueIterator<JSWrapper, DOMWrapped>::next(JSC::ExecState& state, JSC::JSValue& value)
</del><ins>+template<typename JSWrapper>
+bool JSKeyValueIterator<JSWrapper>::next(JSC::ExecState& state, JSC::JSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> typename DOMWrapped::Iterator::Key nextKey;
</span><span class="cx"> typename DOMWrapped::Iterator::Value nextValue;
</span><span class="lines">@@ -133,10 +135,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper, typename DOMWrapped>
-JSC::EncodedJSValue JSC_HOST_CALL JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::next(JSC::ExecState* state)
</del><ins>+template<typename JSWrapper>
+JSC::EncodedJSValue JSC_HOST_CALL JSKeyValueIteratorPrototype<JSWrapper>::next(JSC::ExecState* state)
</ins><span class="cx"> {
</span><del>- JSKeyValueIterator<JSWrapper, DOMWrapped>* iterator = JSC::jsDynamicCast<JSKeyValueIterator<JSWrapper, DOMWrapped>*>(state->thisValue());
</del><ins>+ JSKeyValueIterator<JSWrapper>* iterator = JSC::jsDynamicCast<JSKeyValueIterator<JSWrapper>*>(state->thisValue());
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return JSC::JSValue::encode(throwTypeError(state, ASCIILiteral("Cannot call next() on a non-Iterator object")));
</span><span class="cx">
</span><span class="lines">@@ -145,8 +147,8 @@
</span><span class="cx"> return JSC::JSValue::encode(createIteratorResultObject(state, result, isDone));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper, typename DOMWrapped>
-void JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</del><ins>+template<typename JSWrapper>
+void JSKeyValueIteratorPrototype<JSWrapper>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</ins><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(inherits(info()));
</span></span></pre>
</div>
</div>
</body>
</html>