Changeset 202334 in webkit

Timestamp:

Jun 22, 2016 10:50:15 AM (8 years ago)

Author:

Chris Dumez

Message:

JSDOMIterator forEach should support second optional parameter
​https://bugs.webkit.org/show_bug.cgi?id=159020

Patch by Youenn Fablet <​youennf@gmail.com> on 2016-06-22
Reviewed by Chris Dumez.

Source/WebCore:

Covered by beefed up test.

• bindings/js/JSDOMIterator.h:

(WebCore::iteratorForEach): Setting callback thisValue to the second argument passed to forEach.

LayoutTests:

• fast/dom/nodeListIterator-expected.txt:
• fast/dom/nodeListIterator.html: Adding 'thisValue' various checks.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/nodeListIterator-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/nodeListIterator.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMIterator.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-22  Youenn Fablet  <youennf@gmail.com>
+
+        JSDOMIterator forEach should support second optional parameter
+        https://bugs.webkit.org/show_bug.cgi?id=159020
+
+        Reviewed by Chris Dumez.
+
+        * fast/dom/nodeListIterator-expected.txt:
+        * fast/dom/nodeListIterator.html: Adding 'thisValue' various checks.
+
 2016-06-22  Per Arne Vollan  <pvollan@apple.com>
 

trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt

@@ -12 +12 @@
 PASS forEachIndex is index
 PASS node is children[index++]
+PASS thisValue is window
 PASS forEachContainer is nodeList
 PASS forEachIndex is index
 PASS node is children[index++]
+PASS thisValue is window
+PASS thisValue is window
+PASS thisValue is window
+PASS thisValue is givenThisValue
+PASS thisValue is givenThisValue
 PASS iterator.next().value is children[0]
 PASS iterator.next().value is children[1]

trunk/LayoutTests/fast/dom/nodeListIterator.html

@@ -40 +40 @@
             var forEachIndex;
             var forEachContainer;
+            var thisValue;
             nodeList.forEach(function(n, i, c) {
                 node = n;
                 forEachIndex = i;
                 forEachContainer = c;
+                thisValue = this;
                 shouldBe('forEachContainer', 'nodeList');
                 shouldBe('forEachIndex', 'index');
                 shouldBe('node', 'children[index++]');
+                shouldBe('thisValue', 'window');
             });
-                                                                   
+
+            nodeList.forEach(function() {
+                thisValue = this;
+                shouldBe('thisValue', 'window');
+            }, undefined);
+
+            var givenThisValue = nodeList;
+            nodeList.forEach(function() {
+                thisValue = this;
+                shouldBe('thisValue', 'givenThisValue');
+            }, givenThisValue);
+
             var iterator = nodeList.keys();
             shouldBe('iterator.next().value', 'children[0]');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-22  Youenn Fablet  <youennf@gmail.com>
+
+        JSDOMIterator forEach should support second optional parameter
+        https://bugs.webkit.org/show_bug.cgi?id=159020
+
+        Reviewed by Chris Dumez.
+
+        Covered by beefed up test.
+
+        * bindings/js/JSDOMIterator.h:
+        (WebCore::iteratorForEach): Setting callback thisValue to the second argument passed to forEach.
+
 2016-06-22  Jer Noble  <jer.noble@apple.com>
 

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

@@ -183 +183 @@
         return throwThisTypeError(state, JSWrapper::info()->className, propertyName);
 
+    JSC::JSValue callback = state.argument(0);
+    JSC::JSValue thisValue = state.argument(1);
+
     JSC::CallData callData;
-    JSC::CallType callType = JSC::getCallData(state.argument(0), callData);
+    JSC::CallType callType = JSC::getCallData(callback, callData);
     if (callType == JSC::CallType::None)
         return throwVMTypeError(&state);
@@ -194 +197 @@
         appendForEachArguments(state, wrapper->globalObject(), arguments, value, index);
         arguments.append(wrapper);
-        JSC::call(&state, state.argument(0), callType, callData, wrapper, arguments);
+        JSC::call(&state, callback, callType, callData, thisValue, arguments);
         if (state.hadException())
             break;
-    } 
+    }
     return JSC::JSValue::encode(JSC::jsUndefined());
 }