Changeset 203235 in webkit

Timestamp:

Jul 14, 2016 12:32:24 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

DOMIterators should be assigned a correct prototype
​https://bugs.webkit.org/show_bug.cgi?id=159115

Patch by Youenn Fablet <​youenn@apple.com> on 2016-07-14
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/fetch/api/headers/headers-basic.html: Updating test (changes to be upstreamed to w3c wpt repo)

Source/WebCore:

Default iterator object internal prototype property is the Iterator prototype as defined in
​http://heycam.github.io/webidl/#dfn-iterator-prototype-object.
Linking DOMIterator prototype to IteratorPrototype.
This allows adding @@iterator property to the result of entries, keys and values methods.
This in turns allow doing for-of loops on them.

Covered by updated test.

• ForwardingHeaders/runtime/IteratorPrototype.h: Added.
• bindings/js/JSDOMIterator.h: Setting correct prototype and marking next prototype property as enumerable.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-basic.html (modified) (6 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/ForwardingHeaders/runtime/IteratorPrototype.h (added)
• Source/WebCore/bindings/js/JSDOMIterator.h (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-07-14  Youenn Fablet  <youenn@apple.com>
+
+        DOMIterators should be assigned a correct prototype
+        https://bugs.webkit.org/show_bug.cgi?id=159115
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/fetch/api/headers/headers-basic.html: Updating test (changes to be upstreamed to w3c wpt repo)
+
 2016-07-14  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-basic.html

@@ -121 +121 @@
       };
       var sortedHeaderDict = {};
+      var headerValues = [];
       var sortedHeaderKeys = Object.keys(headerEntriesDict).map(function(value) {
         sortedHeaderDict[value.toLowerCase()] = headerEntriesDict[value];
+        headerValues.push(headerEntriesDict[value]);
         return value.toLowerCase();
       }).sort();
 
+      var iteratorPrototype = Object.getPrototypeOf(Object.getPrototypeOf([].values()));
+      function checkIteratorProperties(iterator) {
+        var prototype = Object.getPrototypeOf(iterator);
+        assert_equals(Object.getPrototypeOf(prototype), iteratorPrototype);
+
+        var descriptor = Object.getOwnPropertyDescriptor(prototype, "next");
+        assert_true(descriptor.configurable, "configurable");
+        assert_true(descriptor.enumerable, "enumerable");
+        assert_true(descriptor.writable, "writable");
+      }
+
       test(function() {
         var headers = new Headers(headerEntriesDict);
         var actual = headers.keys();
+        checkIteratorProperties(actual);
+
         sortedHeaderKeys.forEach(function(key) {
             entry = actual.next();
@@ -136 +151 @@
         assert_true(actual.next().done);
         assert_true(actual.next().done);
+
+        for (key of headers.keys())
+            assert_true(sortedHeaderKeys.indexOf(key) != -1);
       }, "Check keys method");
 
@@ -141 +159 @@
         var headers = new Headers(headerEntriesDict);
         var actual = headers.values();
+        checkIteratorProperties(actual);
 
         sortedHeaderKeys.forEach(function(key) {
@@ -149 +168 @@
         assert_true(actual.next().done);
         assert_true(actual.next().done);
+
+        for (value of headers.values())
+            assert_true(headerValues.indexOf(value) != -1);
       }, "Check values method");
 
@@ -154 +176 @@
         var headers = new Headers(headerEntriesDict);
         var actual = headers.entries();
+        checkIteratorProperties(actual);
 
         sortedHeaderKeys.forEach(function(key) {
@@ -163 +186 @@
         assert_true(actual.next().done);
         assert_true(actual.next().done);
+
+        for (entry of headers.entries())
+            assert_equals(entry[1], sortedHeaderDict[entry[0]]);
       }, "Check entries method");
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-14  Youenn Fablet  <youenn@apple.com>
+
+        DOMIterators should be assigned a correct prototype
+        https://bugs.webkit.org/show_bug.cgi?id=159115
+
+        Reviewed by Chris Dumez.
+
+        Default iterator object internal prototype property is the Iterator prototype as defined in
+        http://heycam.github.io/webidl/#dfn-iterator-prototype-object.
+        Linking DOMIterator prototype to IteratorPrototype.
+        This allows adding @@iterator property to the result of entries, keys and values methods.
+        This in turns allow doing for-of loops on them.
+
+        Covered by updated test.
+
+        * ForwardingHeaders/runtime/IteratorPrototype.h: Added.
+        * bindings/js/JSDOMIterator.h: Setting correct prototype and marking next prototype property as enumerable.
+
 2016-07-14  Youenn Fablet  <youenn@apple.com>
 

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

@@ -28 +28 @@
 
 #include "JSDOMBinding.h"
+#include <runtime/IteratorPrototype.h>
 #include <runtime/JSDestructibleObject.h>
 #include <type_traits>
@@ -98 +99 @@
     {
         return JSDOMIteratorPrototype<JSWrapper>::create(vm, globalObject,
-            JSDOMIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->objectPrototype()));
+            JSDOMIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->iteratorPrototype()));
     }
 
@@ -239 +240 @@
     ASSERT(inherits(info()));
 
-    JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, next, JSC::DontEnum, 0, JSC::NoIntrinsic);
+    JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, next, 0, 0, JSC::NoIntrinsic);
 }