Changeset 159323 in webkit

Timestamp:

Nov 14, 2013 4:55:45 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Clean up sequence handling in Blob constructor
​https://bugs.webkit.org/show_bug.cgi?id=124343

Patch by Victor Costan <​costan@gmail.com> on 2013-11-14
Reviewed by Alexey Proskuryakov.

Source/WebCore:

Added test case to LayoutTests/fast/files/blob-constructor.html

• bindings/js/JSBlobCustom.cpp:

(WebCore::JSBlobConstructor::constructJSBlob):

Handle exceptions in sequences, eliminate double type-checking for
ArrayBuffer, ArrayBufferView and Blob parts.

LayoutTests:

• fast/files/blob-constructor-expected.txt:
• fast/files/script-tests/blob-constructor.js:

Add test with sequence that throws an error on property access.

(get Object):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/files/blob-constructor-expected.txt (modified) (1 diff)
• LayoutTests/fast/files/script-tests/blob-constructor.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSBlobCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-14  Victor Costan  <costan@gmail.com>
+
+        Clean up sequence handling in Blob constructor
+        https://bugs.webkit.org/show_bug.cgi?id=124343
+
+        Reviewed by Alexey Proskuryakov.
+
+        * fast/files/blob-constructor-expected.txt:
+        * fast/files/script-tests/blob-constructor.js:
+            Add test with sequence that throws an error on property access.
+        (get Object):
+
 2013-11-14  Tim Horton  <timothy_horton@apple.com>
 

trunk/LayoutTests/fast/files/blob-constructor-expected.txt

@@ -79 +79 @@
 PASS new Blob({length: 1, 0: 'string'}, {type: 'text/html'}).type is 'text/html'
 PASS new Blob({length: 0}, {endings:'illegal'}) threw exception TypeError: The endings property must be either "transparent" or "native".
+PASS new Blob(throwingSequence) threw exception Error: Misbehaving property.
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/files/script-tests/blob-constructor.js

@@ -107 +107 @@
 shouldBe("new Blob({length: 1, 0: 'string'}, {type: 'text/html'}).type", "'text/html'");
 shouldThrow("new Blob({length: 0}, {endings:'illegal'})", "'TypeError: The endings property must be either \"transparent\" or \"native\"'");
+
+// Test passing blog parts in a sequence-like object that throws on property access.
+var throwingSequence = {length: 4, 0: 'hello', 3: 'world'};
+Object.defineProperty(throwingSequence, "1", {
+    get: function() { throw new Error("Misbehaving property"); },
+    enumerable: true, configurable: true
+});
+Object.defineProperty(throwingSequence, "2", {
+    get: function() { throw new Error("This should not be thrown"); },
+    enumerable: true, configurable: true
+});
+shouldThrow("new Blob(throwingSequence)", "'Error: Misbehaving property'");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-14  Victor Costan  <costan@gmail.com>
+
+        Clean up sequence handling in Blob constructor
+        https://bugs.webkit.org/show_bug.cgi?id=124343
+
+        Reviewed by Alexey Proskuryakov.
+
+        Added test case to LayoutTests/fast/files/blob-constructor.html
+
+        * bindings/js/JSBlobCustom.cpp:
+        (WebCore::JSBlobConstructor::constructJSBlob):
+            Handle exceptions in sequences, eliminate double type-checking for
+            ArrayBuffer, ArrayBufferView and Blob parts.
+
 2013-11-14  Oliver Hunt  <oliver@apple.com>
 

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

@@ -115 +115 @@
     for (unsigned i = 0; i < blobPartsLength; ++i) {
         JSValue item = blobParts->get(exec, i);
+        if (exec->hadException())
+            return JSValue::encode(jsUndefined());
+
 #if ENABLE(BLOB)
-        if (item.inherits(JSArrayBuffer::info()))
-            blobBuilder.append(toArrayBuffer(item));
-        else if (item.inherits(JSArrayBufferView::info()))
-            blobBuilder.append(toArrayBufferView(item));
+        if (ArrayBuffer* arrayBuffer = toArrayBuffer(item))
+            blobBuilder.append(arrayBuffer);
+        else if (RefPtr<ArrayBufferView> arrayBufferView = toArrayBufferView(item))
+            blobBuilder.append(arrayBufferView.release());
         else
 #endif
-        if (item.inherits(JSBlob::info()))
-            blobBuilder.append(toBlob(item));
+        if (Blob* blob = toBlob(item))
+            blobBuilder.append(blob);
         else {
             String string = item.toString(exec)->value(exec);