- Revision
- 100504
- Author
- [email protected]
- Date
- 2011-11-16 14:21:50 -0800 (Wed, 16 Nov 2011)
Log Message
IndexedDB: Reduce nested key depth threshold, re-enable flaky test
https://bugs.webkit.org/show_bug.cgi?id=72529
Patch by Joshua Bell <[email protected]> on 2011-11-16
Reviewed by Adam Barth.
Source/WebCore:
Drop maximum array key depth from 20k to 2k.
* bindings/v8/IDBBindingUtilities.cpp:
LayoutTests:
Re-enable flaky test, and drop the maximum depth tested to avoid
crashes/timeouts on test boxes when prepping the test.
* platform/chromium/test_expectations.txt:
* storage/indexeddb/key-type-array-expected.txt:
* storage/indexeddb/key-type-array.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (100503 => 100504)
--- trunk/LayoutTests/ChangeLog 2011-11-16 22:10:53 UTC (rev 100503)
+++ trunk/LayoutTests/ChangeLog 2011-11-16 22:21:50 UTC (rev 100504)
@@ -1,3 +1,17 @@
+2011-11-16 Joshua Bell <[email protected]>
+
+ IndexedDB: Reduce nested key depth threshold, re-enable flaky test
+ https://bugs.webkit.org/show_bug.cgi?id=72529
+
+ Reviewed by Adam Barth.
+
+ Re-enable flaky test, and drop the maximum depth tested to avoid
+ crashes/timeouts on test boxes when prepping the test.
+
+ * platform/chromium/test_expectations.txt:
+ * storage/indexeddb/key-type-array-expected.txt:
+ * storage/indexeddb/key-type-array.html:
+
2011-11-16 Nate Chapin <[email protected]>
Remove CRASH expectation for
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (100503 => 100504)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-16 22:10:53 UTC (rev 100503)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-16 22:21:50 UTC (rev 100504)
@@ -3832,8 +3832,6 @@
BUGWK71830 : svg/zoom/page/zoom-svg-as-relative-image.html = IMAGE
BUGWK71830 WIN MAC : svg/zoom/page/relative-sized-document-scrollbars.svg = IMAGE+TEXT
-BUG_OJAN : storage/indexeddb/key-type-array.html = TIMEOUT CRASH
-
BUGWK72037 : storage/indexeddb/factory-deletedatabase-interactions.html = TEXT TIMEOUT PASS
BUGRICOW : fast/js/array-functions-non-arrays.html = TEXT
Modified: trunk/LayoutTests/storage/indexeddb/key-type-array-expected.txt (100503 => 100504)
--- trunk/LayoutTests/storage/indexeddb/key-type-array-expected.txt 2011-11-16 22:10:53 UTC (rev 100503)
+++ trunk/LayoutTests/storage/indexeddb/key-type-array-expected.txt 2011-11-16 22:21:50 UTC (rev 100504)
@@ -256,11 +256,9 @@
PASS Exception was thrown.
PASS code is IDBDatabaseException.DATA_ERR
-PASS indexedDB.cmp(makeArrayOfDepth(5), 0) is 1
-PASS indexedDB.cmp(makeArrayOfDepth(50), 0) is 1
-PASS indexedDB.cmp(makeArrayOfDepth(500), 0) is 1
-PASS indexedDB.cmp(makeArrayOfDepth(5000), 0) is 1
-Expecting exception from indexedDB.cmp(makeArrayOfDepth(50000), 0)
+PASS indexedDB.cmp(makeArrayOfDepth(25), 0) is 1
+PASS indexedDB.cmp(makeArrayOfDepth(250), 0) is 1
+Expecting exception from indexedDB.cmp(makeArrayOfDepth(2500), 0)
PASS Exception was thrown.
PASS code is IDBDatabaseException.DATA_ERR
Modified: trunk/LayoutTests/storage/indexeddb/key-type-array.html (100503 => 100504)
--- trunk/LayoutTests/storage/indexeddb/key-type-array.html 2011-11-16 22:10:53 UTC (rev 100503)
+++ trunk/LayoutTests/storage/indexeddb/key-type-array.html 2011-11-16 22:21:50 UTC (rev 100504)
@@ -189,21 +189,18 @@
function makeArrayOfDepth(n)
{
- var array = [], current = array;
+ var array = [];
while (--n) {
- current.push([]);
- current = current[0];
+ array = [array];
}
return array;
}
function testDepthLimits()
{
- shouldBe("indexedDB.cmp(makeArrayOfDepth(5), 0)", "1");
- shouldBe("indexedDB.cmp(makeArrayOfDepth(50), 0)", "1");
- shouldBe("indexedDB.cmp(makeArrayOfDepth(500), 0)", "1");
- shouldBe("indexedDB.cmp(makeArrayOfDepth(5000), 0)", "1");
- evalAndExpectException("indexedDB.cmp(makeArrayOfDepth(50000), 0)", "IDBDatabaseException.DATA_ERR");
+ shouldBe("indexedDB.cmp(makeArrayOfDepth(25), 0)", "1");
+ shouldBe("indexedDB.cmp(makeArrayOfDepth(250), 0)", "1");
+ evalAndExpectException("indexedDB.cmp(makeArrayOfDepth(2500), 0)", "IDBDatabaseException.DATA_ERR");
debug("");
done();
Modified: trunk/Source/WebCore/ChangeLog (100503 => 100504)
--- trunk/Source/WebCore/ChangeLog 2011-11-16 22:10:53 UTC (rev 100503)
+++ trunk/Source/WebCore/ChangeLog 2011-11-16 22:21:50 UTC (rev 100504)
@@ -1,3 +1,14 @@
+2011-11-16 Joshua Bell <[email protected]>
+
+ IndexedDB: Reduce nested key depth threshold, re-enable flaky test
+ https://bugs.webkit.org/show_bug.cgi?id=72529
+
+ Reviewed by Adam Barth.
+
+ Drop maximum array key depth from 20k to 2k.
+
+ * bindings/v8/IDBBindingUtilities.cpp:
+
2011-11-16 Nate Chapin <[email protected]>
Fix incorrect multipart handling in r100311.
Modified: trunk/Source/WebCore/bindings/v8/IDBBindingUtilities.cpp (100503 => 100504)
--- trunk/Source/WebCore/bindings/v8/IDBBindingUtilities.cpp 2011-11-16 22:10:53 UTC (rev 100503)
+++ trunk/Source/WebCore/bindings/v8/IDBBindingUtilities.cpp 2011-11-16 22:21:50 UTC (rev 100504)
@@ -38,7 +38,7 @@
namespace WebCore {
-static const size_t maximumDepth = 20000;
+static const size_t maximumDepth = 2000;
static PassRefPtr<IDBKey> createIDBKeyFromValue(v8::Handle<v8::Value> value, Vector<v8::Handle<v8::Array> >& stack)
{
