Changeset 196170 in webkit

Timestamp:

Feb 5, 2016 1:59:15 AM (8 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSFetchHeadersCustom.cpp (modified) (2 diffs)
• bindings/js/JSKeyValueIterator.h (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2016-02-05  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/bindings/js/JSFetchHeadersCustom.cpp

@@ -37 +37 @@
 
 // FIXME: Move this code to JSFetchHeaders.
-using FetchHeadersIterator = JSKeyValueIterator<JSFetchHeaders, FetchHeaders>;
-using FetchHeadersIteratorPrototype = JSKeyValueIteratorPrototype<JSFetchHeaders, FetchHeaders>;
+using FetchHeadersIterator = JSKeyValueIterator<JSFetchHeaders>;
+using FetchHeadersIteratorPrototype = JSKeyValueIteratorPrototype<JSFetchHeaders>;
 
 template<>
@@ -48 +48 @@
 JSC::JSValue JSFetchHeaders::entries(JSC::ExecState&)
 {
-    return createIterator<JSFetchHeaders, FetchHeaders>(*globalObject(), *this, IterationKind::KeyValue);
+    return createIterator<JSFetchHeaders>(*globalObject(), *this, IterationKind::KeyValue);
 }
 
 JSC::JSValue JSFetchHeaders::keys(JSC::ExecState&)
 {
-    return createIterator<JSFetchHeaders, FetchHeaders>(*globalObject(), *this, IterationKind::Key);
+    return createIterator<JSFetchHeaders>(*globalObject(), *this, IterationKind::Key);
 }
 
 JSC::JSValue JSFetchHeaders::values(JSC::ExecState&)
 {
-    return createIterator<JSFetchHeaders, FetchHeaders>(*globalObject(), *this, IterationKind::Value);
+    return createIterator<JSFetchHeaders>(*globalObject(), *this, IterationKind::Value);
 }
 

trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h

@@ -29 +29 @@
 #include "JSDOMBinding.h"
 #include <runtime/JSDestructibleObject.h>
+#include <type_traits>
 
 namespace WebCore {
 
-// FIXME: Update binding generator to allow getting DOMWrapped from JSWrapper.
-template<typename JSWrapper, typename DOMWrapped>
+template<typename JSWrapper>
 class JSKeyValueIteratorPrototype : public JSC::JSNonFinalObject {
 public:
-    typedef JSC::JSNonFinalObject Base;
+    using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
+    using Base = JSC::JSNonFinalObject;
 
     static JSKeyValueIteratorPrototype* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
@@ -62 +63 @@
 enum class IterationKind { Key, Value, KeyValue };
 
-template<typename JSWrapper, typename DOMWrapped>
+template<typename JSWrapper>
 class JSKeyValueIterator: public JSDOMObject {
 public:
-    typedef JSDOMObject Base;
+    using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
+    using Base = JSDOMObject;
 
     DECLARE_INFO;
@@ -81 +83 @@
     }
 
-    static JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
+    static JSKeyValueIteratorPrototype<JSWrapper>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
     {
-        return JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::create(vm, globalObject,
-            JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::createStructure(vm, globalObject, globalObject->objectPrototype()));
+        return JSKeyValueIteratorPrototype<JSWrapper>::create(vm, globalObject,
+            JSKeyValueIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->objectPrototype()));
     }
 
@@ -103 +105 @@
 };
 
-template<typename JSWrapper, typename DOMWrapped>
-JSKeyValueIterator<JSWrapper, DOMWrapped>* createIterator(JSDOMGlobalObject& globalObject, JSWrapper& wrapper, IterationKind kind)
+template<typename JSWrapper>
+JSKeyValueIterator<JSWrapper>* createIterator(JSDOMGlobalObject& globalObject, JSWrapper& wrapper, IterationKind kind)
 {
-    return JSKeyValueIterator<JSWrapper, DOMWrapped>::create(globalObject.vm(), getDOMStructure<JSKeyValueIterator<JSWrapper, DOMWrapped>>(globalObject.vm(), globalObject), wrapper, kind);
+    return JSKeyValueIterator<JSWrapper>::create(globalObject.vm(), getDOMStructure<JSKeyValueIterator<JSWrapper>>(globalObject.vm(), globalObject), wrapper, kind);
 }
 
-template<typename JSWrapper, typename DOMWrapped>
-void JSKeyValueIterator<JSWrapper, DOMWrapped>::destroy(JSCell* cell)
+template<typename JSWrapper>
+void JSKeyValueIterator<JSWrapper>::destroy(JSCell* cell)
 {
-    JSKeyValueIterator<JSWrapper, DOMWrapped>* thisObject = JSC::jsCast<JSKeyValueIterator<JSWrapper, DOMWrapped>*>(cell);
-    thisObject->JSKeyValueIterator<JSWrapper, DOMWrapped>::~JSKeyValueIterator();
+    JSKeyValueIterator<JSWrapper>* thisObject = JSC::jsCast<JSKeyValueIterator<JSWrapper>*>(cell);
+    thisObject->JSKeyValueIterator<JSWrapper>::~JSKeyValueIterator();
 }
 
-template<typename JSWrapper, typename DOMWrapped>
-bool JSKeyValueIterator<JSWrapper, DOMWrapped>::next(JSC::ExecState& state, JSC::JSValue& value)
+template<typename JSWrapper>
+bool JSKeyValueIterator<JSWrapper>::next(JSC::ExecState& state, JSC::JSValue& value)
 {
     typename DOMWrapped::Iterator::Key nextKey;
@@ -134 +136 @@
 }
 
-template<typename JSWrapper, typename DOMWrapped>
-JSC::EncodedJSValue JSC_HOST_CALL JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::next(JSC::ExecState* state)
+template<typename JSWrapper>
+JSC::EncodedJSValue JSC_HOST_CALL JSKeyValueIteratorPrototype<JSWrapper>::next(JSC::ExecState* state)
 {
-    JSKeyValueIterator<JSWrapper, DOMWrapped>* iterator = JSC::jsDynamicCast<JSKeyValueIterator<JSWrapper, DOMWrapped>*>(state->thisValue());
+    JSKeyValueIterator<JSWrapper>* iterator = JSC::jsDynamicCast<JSKeyValueIterator<JSWrapper>*>(state->thisValue());
     if (!iterator)
         return JSC::JSValue::encode(throwTypeError(state, ASCIILiteral("Cannot call next() on a non-Iterator object")));
@@ -146 +148 @@
 }
 
-template<typename JSWrapper, typename DOMWrapped>
-void JSKeyValueIteratorPrototype<JSWrapper, DOMWrapped>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
+template<typename JSWrapper>
+void JSKeyValueIteratorPrototype<JSWrapper>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
 {
     Base::finishCreation(vm);