[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreip at google.com
andreip at google.com
Wed Dec 22 14:30:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6311b1fecbd088035cf57b4a6f376aac8e09ceb6
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 12 00:16:25 2010 +0000
2010-10-11 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
The names of IndexedDB-specific attributes of DOMWindow should be prefixed with 'webkit'.
https://bugs.webkit.org/show_bug.cgi?id=47508
* storage/indexeddb/basics-expected.txt:
* storage/indexeddb/basics.html:
* storage/indexeddb/constants-expected.txt:
* storage/indexeddb/constants.html:
* storage/indexeddb/database-basics-expected.txt:
* storage/indexeddb/database-basics.html:
* storage/indexeddb/database-quota-expected.txt:
* storage/indexeddb/database-quota.html:
* storage/indexeddb/index-basics-expected.txt:
* storage/indexeddb/index-basics.html:
* storage/indexeddb/index-cursor-expected.txt:
* storage/indexeddb/index-cursor.html:
* storage/indexeddb/keyrange-expected.txt:
* storage/indexeddb/keyrange.html:
* storage/indexeddb/objectstore-basics-expected.txt:
* storage/indexeddb/objectstore-basics.html:
* storage/indexeddb/objectstore-cursor-expected.txt:
* storage/indexeddb/objectstore-cursor.html:
* storage/indexeddb/objectstore-removeobjectstore-expected.txt:
* storage/indexeddb/objectstore-removeobjectstore.html:
* storage/indexeddb/open-cursor-expected.txt:
* storage/indexeddb/open-cursor.html:
* storage/indexeddb/transaction-basics-expected.txt:
* storage/indexeddb/transaction-basics.html:
2010-10-11 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
The names of IndexedDB-specific attributes of DOMWindow should be prefixed with 'webkit'.
https://bugs.webkit.org/show_bug.cgi?id=47508
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setWebkitIndexedDBEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIndexedDBEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBCursorEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBDatabaseEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBDatabaseErrorEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBDatabaseExceptionEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBErrorEventEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBEventEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBFactoryEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBIndexEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBKeyRangeEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBObjectStoreEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBRequestEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBSuccessEventEnabled):
(WebCore::RuntimeEnabledFeatures::webkitIDBTransactionEnabled):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::webkitIndexedDB):
* page/DOMWindow.h:
* page/DOMWindow.idl:
2010-10-11 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
The names of IndexedDB-specific attributes of DOMWindow should be prefixed with 'webkit'.
https://bugs.webkit.org/show_bug.cgi?id=47508
* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enableIndexedDatabase):
(WebKit::WebRuntimeFeatures::isIndexedDatabaseEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 679f940..0ed0413 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,35 @@
+2010-10-11 Andrei Popescu <andreip at google.com>
+
+ Reviewed by Jeremy Orlow.
+
+ The names of IndexedDB-specific attributes of DOMWindow should be prefixed with 'webkit'.
+ https://bugs.webkit.org/show_bug.cgi?id=47508
+
+ * storage/indexeddb/basics-expected.txt:
+ * storage/indexeddb/basics.html:
+ * storage/indexeddb/constants-expected.txt:
+ * storage/indexeddb/constants.html:
+ * storage/indexeddb/database-basics-expected.txt:
+ * storage/indexeddb/database-basics.html:
+ * storage/indexeddb/database-quota-expected.txt:
+ * storage/indexeddb/database-quota.html:
+ * storage/indexeddb/index-basics-expected.txt:
+ * storage/indexeddb/index-basics.html:
+ * storage/indexeddb/index-cursor-expected.txt:
+ * storage/indexeddb/index-cursor.html:
+ * storage/indexeddb/keyrange-expected.txt:
+ * storage/indexeddb/keyrange.html:
+ * storage/indexeddb/objectstore-basics-expected.txt:
+ * storage/indexeddb/objectstore-basics.html:
+ * storage/indexeddb/objectstore-cursor-expected.txt:
+ * storage/indexeddb/objectstore-cursor.html:
+ * storage/indexeddb/objectstore-removeobjectstore-expected.txt:
+ * storage/indexeddb/objectstore-removeobjectstore.html:
+ * storage/indexeddb/open-cursor-expected.txt:
+ * storage/indexeddb/open-cursor.html:
+ * storage/indexeddb/transaction-basics-expected.txt:
+ * storage/indexeddb/transaction-basics.html:
+
2010-10-11 Adam Barth <abarth at webkit.org>
Rebaseline SVG expectations.
diff --git a/LayoutTests/storage/indexeddb/basics-expected.txt b/LayoutTests/storage/indexeddb/basics-expected.txt
index 7632e40..f7c8e3f 100644
--- a/LayoutTests/storage/indexeddb/basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/basics-expected.txt
@@ -3,9 +3,9 @@ Test IndexedDB's basics.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS 'indexedDB' in window is true
-PASS indexedDB == null is false
-indexedDB.open('name', 'description')
+PASS 'webkitIndexedDB' in window is true
+PASS webkitIndexedDB == null is false
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/basics.html b/LayoutTests/storage/indexeddb/basics.html
index 9f5f20f..905662f 100644
--- a/LayoutTests/storage/indexeddb/basics.html
+++ b/LayoutTests/storage/indexeddb/basics.html
@@ -22,12 +22,12 @@ function openCallback()
function test()
{
- shouldBeTrue("'indexedDB' in window");
- shouldBeFalse("indexedDB == null");
+ shouldBeTrue("'webkitIndexedDB' in window");
+ shouldBeFalse("webkitIndexedDB == null");
// FIXME: Verify other IndexedDatabaseRequest constructors, once they're implemented.
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openCallback;
result.onerror = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/constants-expected.txt b/LayoutTests/storage/indexeddb/constants-expected.txt
index ff47655..15a2df7 100644
--- a/LayoutTests/storage/indexeddb/constants-expected.txt
+++ b/LayoutTests/storage/indexeddb/constants-expected.txt
@@ -3,32 +3,32 @@ Test IndexedDB's constants.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS IDBKeyRange.SINGLE is 0
-PASS IDBKeyRange.LEFT_OPEN is 1
-PASS IDBKeyRange.RIGHT_OPEN is 2
-PASS IDBKeyRange.LEFT_BOUND is 4
-PASS IDBKeyRange.RIGHT_BOUND is 8
-PASS IDBDatabaseException.UNKNOWN_ERR is 0
-PASS IDBDatabaseException.NON_TRANSIENT_ERR is 1
-PASS IDBDatabaseException.NOT_FOUND_ERR is 2
-PASS IDBDatabaseException.CONSTRAINT_ERR is 3
-PASS IDBDatabaseException.DATA_ERR is 4
-PASS IDBDatabaseException.NOT_ALLOWED_ERR is 5
-PASS IDBDatabaseException.SERIAL_ERR is 11
-PASS IDBDatabaseException.RECOVERABLE_ERR is 21
-PASS IDBDatabaseException.TRANSIENT_ERR is 31
-PASS IDBDatabaseException.TIMEOUT_ERR is 32
-PASS IDBDatabaseException.DEADLOCK_ERR is 33
-PASS IDBRequest.LOADING is 1
-PASS IDBRequest.DONE is 2
-PASS IDBCursor.NEXT is 0
-PASS IDBCursor.NEXT_NO_DUPLICATE is 1
-PASS IDBCursor.PREV is 2
-PASS IDBCursor.PREV_NO_DUPLICATE is 3
-PASS IDBTransaction.READ_WRITE is 0
-PASS IDBTransaction.READ_ONLY is 1
-PASS IDBTransaction.SNAPSHOT_READ is 2
-PASS IDBTransaction.VERSION_CHANGE is 3
+PASS webkitIDBKeyRange.SINGLE is 0
+PASS webkitIDBKeyRange.LEFT_OPEN is 1
+PASS webkitIDBKeyRange.RIGHT_OPEN is 2
+PASS webkitIDBKeyRange.LEFT_BOUND is 4
+PASS webkitIDBKeyRange.RIGHT_BOUND is 8
+PASS webkitIDBDatabaseException.UNKNOWN_ERR is 0
+PASS webkitIDBDatabaseException.NON_TRANSIENT_ERR is 1
+PASS webkitIDBDatabaseException.NOT_FOUND_ERR is 2
+PASS webkitIDBDatabaseException.CONSTRAINT_ERR is 3
+PASS webkitIDBDatabaseException.DATA_ERR is 4
+PASS webkitIDBDatabaseException.NOT_ALLOWED_ERR is 5
+PASS webkitIDBDatabaseException.SERIAL_ERR is 11
+PASS webkitIDBDatabaseException.RECOVERABLE_ERR is 21
+PASS webkitIDBDatabaseException.TRANSIENT_ERR is 31
+PASS webkitIDBDatabaseException.TIMEOUT_ERR is 32
+PASS webkitIDBDatabaseException.DEADLOCK_ERR is 33
+PASS webkitIDBRequest.LOADING is 1
+PASS webkitIDBRequest.DONE is 2
+PASS webkitIDBCursor.NEXT is 0
+PASS webkitIDBCursor.NEXT_NO_DUPLICATE is 1
+PASS webkitIDBCursor.PREV is 2
+PASS webkitIDBCursor.PREV_NO_DUPLICATE is 3
+PASS webkitIDBTransaction.READ_WRITE is 0
+PASS webkitIDBTransaction.READ_ONLY is 1
+PASS webkitIDBTransaction.SNAPSHOT_READ is 2
+PASS webkitIDBTransaction.VERSION_CHANGE is 3
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/storage/indexeddb/constants.html b/LayoutTests/storage/indexeddb/constants.html
index dd24917..813fe7a 100644
--- a/LayoutTests/storage/indexeddb/constants.html
+++ b/LayoutTests/storage/indexeddb/constants.html
@@ -16,36 +16,36 @@ if (window.layoutTestController)
function test()
{
- shouldBe("IDBKeyRange.SINGLE", "0");
- shouldBe("IDBKeyRange.LEFT_OPEN", "1");
- shouldBe("IDBKeyRange.RIGHT_OPEN", "2");
- shouldBe("IDBKeyRange.LEFT_BOUND", "4");
- shouldBe("IDBKeyRange.RIGHT_BOUND", "8");
-
- shouldBe("IDBDatabaseException.UNKNOWN_ERR", "0");
- shouldBe("IDBDatabaseException.NON_TRANSIENT_ERR", "1");
- shouldBe("IDBDatabaseException.NOT_FOUND_ERR", "2");
- shouldBe("IDBDatabaseException.CONSTRAINT_ERR", "3");
- shouldBe("IDBDatabaseException.DATA_ERR", "4");
- shouldBe("IDBDatabaseException.NOT_ALLOWED_ERR", "5");
- shouldBe("IDBDatabaseException.SERIAL_ERR", "11");
- shouldBe("IDBDatabaseException.RECOVERABLE_ERR", "21");
- shouldBe("IDBDatabaseException.TRANSIENT_ERR", "31");
- shouldBe("IDBDatabaseException.TIMEOUT_ERR", "32");
- shouldBe("IDBDatabaseException.DEADLOCK_ERR", "33");
-
- shouldBe("IDBRequest.LOADING", "1");
- shouldBe("IDBRequest.DONE", "2");
-
- shouldBe("IDBCursor.NEXT", "0");
- shouldBe("IDBCursor.NEXT_NO_DUPLICATE", "1");
- shouldBe("IDBCursor.PREV", "2");
- shouldBe("IDBCursor.PREV_NO_DUPLICATE", "3");
-
- shouldBe("IDBTransaction.READ_WRITE", "0");
- shouldBe("IDBTransaction.READ_ONLY", "1");
- shouldBe("IDBTransaction.SNAPSHOT_READ", "2");
- shouldBe("IDBTransaction.VERSION_CHANGE", "3");
+ shouldBe("webkitIDBKeyRange.SINGLE", "0");
+ shouldBe("webkitIDBKeyRange.LEFT_OPEN", "1");
+ shouldBe("webkitIDBKeyRange.RIGHT_OPEN", "2");
+ shouldBe("webkitIDBKeyRange.LEFT_BOUND", "4");
+ shouldBe("webkitIDBKeyRange.RIGHT_BOUND", "8");
+
+ shouldBe("webkitIDBDatabaseException.UNKNOWN_ERR", "0");
+ shouldBe("webkitIDBDatabaseException.NON_TRANSIENT_ERR", "1");
+ shouldBe("webkitIDBDatabaseException.NOT_FOUND_ERR", "2");
+ shouldBe("webkitIDBDatabaseException.CONSTRAINT_ERR", "3");
+ shouldBe("webkitIDBDatabaseException.DATA_ERR", "4");
+ shouldBe("webkitIDBDatabaseException.NOT_ALLOWED_ERR", "5");
+ shouldBe("webkitIDBDatabaseException.SERIAL_ERR", "11");
+ shouldBe("webkitIDBDatabaseException.RECOVERABLE_ERR", "21");
+ shouldBe("webkitIDBDatabaseException.TRANSIENT_ERR", "31");
+ shouldBe("webkitIDBDatabaseException.TIMEOUT_ERR", "32");
+ shouldBe("webkitIDBDatabaseException.DEADLOCK_ERR", "33");
+
+ shouldBe("webkitIDBRequest.LOADING", "1");
+ shouldBe("webkitIDBRequest.DONE", "2");
+
+ shouldBe("webkitIDBCursor.NEXT", "0");
+ shouldBe("webkitIDBCursor.NEXT_NO_DUPLICATE", "1");
+ shouldBe("webkitIDBCursor.PREV", "2");
+ shouldBe("webkitIDBCursor.PREV_NO_DUPLICATE", "3");
+
+ shouldBe("webkitIDBTransaction.READ_WRITE", "0");
+ shouldBe("webkitIDBTransaction.READ_ONLY", "1");
+ shouldBe("webkitIDBTransaction.SNAPSHOT_READ", "2");
+ shouldBe("webkitIDBTransaction.VERSION_CHANGE", "3");
}
test();
diff --git a/LayoutTests/storage/indexeddb/database-basics-expected.txt b/LayoutTests/storage/indexeddb/database-basics-expected.txt
index 374150c..b0674ad 100644
--- a/LayoutTests/storage/indexeddb/database-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/database-basics-expected.txt
@@ -3,7 +3,7 @@ Test the basics of IndexedDB's IDBDatabase.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('name', 'description')
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/database-basics.html b/LayoutTests/storage/indexeddb/database-basics.html
index fe0cb19..2738c59 100644
--- a/LayoutTests/storage/indexeddb/database-basics.html
+++ b/LayoutTests/storage/indexeddb/database-basics.html
@@ -16,7 +16,7 @@ if (window.layoutTestController)
function test()
{
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openSuccess;
result.onerror = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/database-quota-expected.txt b/LayoutTests/storage/indexeddb/database-quota-expected.txt
index cd62b56..71734f9 100644
--- a/LayoutTests/storage/indexeddb/database-quota-expected.txt
+++ b/LayoutTests/storage/indexeddb/database-quota-expected.txt
@@ -3,7 +3,7 @@ Tests IndexedDB's quota enforcing mechanism.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('name', 'description')
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/database-quota.html b/LayoutTests/storage/indexeddb/database-quota.html
index 3ebdf1c..115b70e 100644
--- a/LayoutTests/storage/indexeddb/database-quota.html
+++ b/LayoutTests/storage/indexeddb/database-quota.html
@@ -16,7 +16,7 @@ if (window.layoutTestController)
function test()
{
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openSuccess;
result.onerror = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/index-basics-expected.txt b/LayoutTests/storage/indexeddb/index-basics-expected.txt
index 83b14b4..ccb68a3 100644
--- a/LayoutTests/storage/indexeddb/index-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/index-basics-expected.txt
@@ -1,9 +1,9 @@
-Test the basics of IndexedDB's IDBIndex.
+Test the basics of IndexedDB's webkitIDBIndex.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('name', 'description')
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
@@ -144,7 +144,7 @@ PASS 'onerror' in event.target is true
PASS 'readyState' in event.target is true
PASS event.target.readyState is event.target.DONE
-PASS event.code is IDBDatabaseException.NOT_FOUND_ERR
+PASS event.code is webkitIDBDatabaseException.NOT_FOUND_ERR
indexObject.get('does not exist')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
@@ -162,7 +162,7 @@ PASS 'onerror' in event.target is true
PASS 'readyState' in event.target is true
PASS event.target.readyState is event.target.DONE
-PASS event.code is IDBDatabaseException.NOT_FOUND_ERR
+PASS event.code is webkitIDBDatabaseException.NOT_FOUND_ERR
indexObject.openKeyCursor()
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
diff --git a/LayoutTests/storage/indexeddb/index-basics.html b/LayoutTests/storage/indexeddb/index-basics.html
index 2221ed8..49cac00 100644
--- a/LayoutTests/storage/indexeddb/index-basics.html
+++ b/LayoutTests/storage/indexeddb/index-basics.html
@@ -10,13 +10,13 @@
<div id="console"></div>
<script>
-description("Test the basics of IndexedDB's IDBIndex.");
+description("Test the basics of IndexedDB's webkitIDBIndex.");
if (window.layoutTestController)
layoutTestController.waitUntilDone();
function test()
{
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
@@ -118,7 +118,7 @@ function getDataFail()
function getObjectDataFail()
{
verifyErrorEvent(event);
- shouldBe("event.code", "IDBDatabaseException.NOT_FOUND_ERR");
+ shouldBe("event.code", "webkitIDBDatabaseException.NOT_FOUND_ERR");
result = evalAndLog("indexObject.get('does not exist')");
verifyResult(result);
@@ -129,7 +129,7 @@ function getObjectDataFail()
function openKeyCursor()
{
verifyErrorEvent(event);
- shouldBe("event.code", "IDBDatabaseException.NOT_FOUND_ERR");
+ shouldBe("event.code", "webkitIDBDatabaseException.NOT_FOUND_ERR");
window.result = evalAndLog("indexObject.openKeyCursor()");
verifyResult(result);
diff --git a/LayoutTests/storage/indexeddb/index-cursor-expected.txt b/LayoutTests/storage/indexeddb/index-cursor-expected.txt
index aefdcd0..88b96ff 100644
--- a/LayoutTests/storage/indexeddb/index-cursor-expected.txt
+++ b/LayoutTests/storage/indexeddb/index-cursor-expected.txt
@@ -1,9 +1,9 @@
-Test IndexedDB's IDBIndex.openCursor + the cursor it produces in depth.
+Test IndexedDB's webkitIDBIndex.openCursor + the cursor it produces in depth.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('someDB', 'some description')
+webkitIndexedDB.open('someDB', 'some description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/index-cursor.html b/LayoutTests/storage/indexeddb/index-cursor.html
index e85295b..5aab4f8 100644
--- a/LayoutTests/storage/indexeddb/index-cursor.html
+++ b/LayoutTests/storage/indexeddb/index-cursor.html
@@ -10,7 +10,7 @@
<div id="console"></div>
<script>
-description("Test IndexedDB's IDBIndex.openCursor + the cursor it produces in depth.");
+description("Test IndexedDB's webkitIDBIndex.openCursor + the cursor it produces in depth.");
if (window.layoutTestController)
layoutTestController.waitUntilDone();
@@ -29,7 +29,7 @@ window.testData = [
function openDatabase()
{
- result = evalAndLog("indexedDB.open('someDB', 'some description')");
+ result = evalAndLog("webkitIndexedDB.open('someDB', 'some description')");
verifyResult(result);
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
@@ -180,13 +180,13 @@ function runNextTest()
var keyRange;
if (lower !== null && upper !== null)
- keyRange = IDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
+ keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
else if (lower !== null)
- keyRange = IDBKeyRange.leftBound(testData[lower], lowerIsOpen);
+ keyRange = webkitIDBKeyRange.leftBound(testData[lower], lowerIsOpen);
else
- keyRange = IDBKeyRange.rightBound(testData[upper], upperIsOpen);
+ keyRange = webkitIDBKeyRange.rightBound(testData[upper], upperIsOpen);
- var request = indexObject.openKeyCursor(keyRange, ascending ? IDBCursor.NEXT : IDBCursor.PREV);
+ var request = indexObject.openKeyCursor(keyRange, ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV);
request.onsuccess = cursorIteration;
request.onerror = unexpectedErrorCallback;
}
diff --git a/LayoutTests/storage/indexeddb/keyrange-expected.txt b/LayoutTests/storage/indexeddb/keyrange-expected.txt
index 6528a11..8d6bf86 100644
--- a/LayoutTests/storage/indexeddb/keyrange-expected.txt
+++ b/LayoutTests/storage/indexeddb/keyrange-expected.txt
@@ -3,20 +3,20 @@ Test IndexedDB's KeyRange.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS 'SINGLE' in IDBKeyRange is true
-PASS 'LEFT_OPEN' in IDBKeyRange is true
-PASS 'RIGHT_OPEN' in IDBKeyRange is true
-PASS 'LEFT_BOUND' in IDBKeyRange is true
-PASS 'RIGHT_BOUND' in IDBKeyRange is true
-PASS 'left' in IDBKeyRange is false
-PASS 'right' in IDBKeyRange is false
-PASS 'flags' in IDBKeyRange is false
-PASS 'only' in IDBKeyRange is true
-PASS 'leftBound' in IDBKeyRange is true
-PASS 'rightBound' in IDBKeyRange is true
-PASS 'bound' in IDBKeyRange is true
+PASS 'SINGLE' in webkitIDBKeyRange is true
+PASS 'LEFT_OPEN' in webkitIDBKeyRange is true
+PASS 'RIGHT_OPEN' in webkitIDBKeyRange is true
+PASS 'LEFT_BOUND' in webkitIDBKeyRange is true
+PASS 'RIGHT_BOUND' in webkitIDBKeyRange is true
+PASS 'left' in webkitIDBKeyRange is false
+PASS 'right' in webkitIDBKeyRange is false
+PASS 'flags' in webkitIDBKeyRange is false
+PASS 'only' in webkitIDBKeyRange is true
+PASS 'leftBound' in webkitIDBKeyRange is true
+PASS 'rightBound' in webkitIDBKeyRange is true
+PASS 'bound' in webkitIDBKeyRange is true
-instance = IDBKeyRange.only(1)
+instance = webkitIDBKeyRange.only(1)
PASS 'SINGLE' in instance is true
PASS 'LEFT_OPEN' in instance is true
PASS 'RIGHT_OPEN' in instance is true
@@ -30,113 +30,113 @@ PASS 'leftBound' in instance is false
PASS 'rightBound' in instance is false
PASS 'bound' in instance is false
-IDBKeyRange.only(1)
+webkitIDBKeyRange.only(1)
PASS keyRange.left is 1
PASS keyRange.right is 1
PASS keyRange.flags is keyRange.SINGLE
-IDBKeyRange.only('a')
+webkitIDBKeyRange.only('a')
PASS keyRange.left is 'a'
PASS keyRange.right is 'a'
PASS keyRange.flags is keyRange.SINGLE
-IDBKeyRange.leftBound(10,true)
+webkitIDBKeyRange.leftBound(10,true)
PASS keyRange.left is 10
PASS keyRange.right is null
PASS keyRange.flags is keyRange.LEFT_OPEN | keyRange.LEFT_BOUND
-IDBKeyRange.leftBound(11,false)
+webkitIDBKeyRange.leftBound(11,false)
PASS keyRange.left is 11
PASS keyRange.right is null
PASS keyRange.flags is keyRange.LEFT_BOUND
-IDBKeyRange.leftBound(12,undefined)
+webkitIDBKeyRange.leftBound(12,undefined)
PASS keyRange.left is 12
PASS keyRange.right is null
PASS keyRange.flags is keyRange.LEFT_BOUND
-IDBKeyRange.leftBound('aa',true)
+webkitIDBKeyRange.leftBound('aa',true)
PASS keyRange.left is 'aa'
PASS keyRange.right is null
PASS keyRange.flags is keyRange.LEFT_OPEN | keyRange.LEFT_BOUND
-IDBKeyRange.leftBound('ab',false)
+webkitIDBKeyRange.leftBound('ab',false)
PASS keyRange.left is 'ab'
PASS keyRange.right is null
PASS keyRange.flags is keyRange.LEFT_BOUND
-IDBKeyRange.leftBound('ac',undefined)
+webkitIDBKeyRange.leftBound('ac',undefined)
PASS keyRange.left is 'ac'
PASS keyRange.right is null
PASS keyRange.flags is keyRange.LEFT_BOUND
-IDBKeyRange.rightBound(20,true)
+webkitIDBKeyRange.rightBound(20,true)
PASS keyRange.right is 20
PASS keyRange.left is null
PASS keyRange.flags is keyRange.RIGHT_OPEN | keyRange.RIGHT_BOUND
-IDBKeyRange.rightBound(21,false)
+webkitIDBKeyRange.rightBound(21,false)
PASS keyRange.right is 21
PASS keyRange.left is null
PASS keyRange.flags is keyRange.RIGHT_BOUND
-IDBKeyRange.rightBound(22,undefined)
+webkitIDBKeyRange.rightBound(22,undefined)
PASS keyRange.right is 22
PASS keyRange.left is null
PASS keyRange.flags is keyRange.RIGHT_BOUND
-IDBKeyRange.rightBound('ba',true)
+webkitIDBKeyRange.rightBound('ba',true)
PASS keyRange.right is 'ba'
PASS keyRange.left is null
PASS keyRange.flags is keyRange.RIGHT_OPEN | keyRange.RIGHT_BOUND
-IDBKeyRange.rightBound('bb',false)
+webkitIDBKeyRange.rightBound('bb',false)
PASS keyRange.right is 'bb'
PASS keyRange.left is null
PASS keyRange.flags is keyRange.RIGHT_BOUND
-IDBKeyRange.rightBound('bc',undefined)
+webkitIDBKeyRange.rightBound('bc',undefined)
PASS keyRange.right is 'bc'
PASS keyRange.left is null
PASS keyRange.flags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound(30,40,undefined,undefined)
+webkitIDBKeyRange.bound(30,40,undefined,undefined)
PASS keyRange.left is 30
PASS keyRange.right is 40
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound(31,41,false,false)
+webkitIDBKeyRange.bound(31,41,false,false)
PASS keyRange.left is 31
PASS keyRange.right is 41
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound(32,42,false,true)
+webkitIDBKeyRange.bound(32,42,false,true)
PASS keyRange.left is 32
PASS keyRange.right is 42
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_OPEN | keyRange.RIGHT_BOUND
-IDBKeyRange.bound(33,43,true,false)
+webkitIDBKeyRange.bound(33,43,true,false)
PASS keyRange.left is 33
PASS keyRange.right is 43
PASS leftFlags is keyRange.LEFT_OPEN | keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound(34,44,true,true)
+webkitIDBKeyRange.bound(34,44,true,true)
PASS keyRange.left is 34
PASS keyRange.right is 44
PASS leftFlags is keyRange.LEFT_OPEN | keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_OPEN | keyRange.RIGHT_BOUND
-IDBKeyRange.bound('aaa','aba',false,false)
+webkitIDBKeyRange.bound('aaa','aba',false,false)
PASS keyRange.left is 'aaa'
PASS keyRange.right is 'aba'
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound('aab','abb',undefined,undefined)
+webkitIDBKeyRange.bound('aab','abb',undefined,undefined)
PASS keyRange.left is 'aab'
PASS keyRange.right is 'abb'
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound('aac','abc',false,false)
+webkitIDBKeyRange.bound('aac','abc',false,false)
PASS keyRange.left is 'aac'
PASS keyRange.right is 'abc'
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound('aad','abd',false,true)
+webkitIDBKeyRange.bound('aad','abd',false,true)
PASS keyRange.left is 'aad'
PASS keyRange.right is 'abd'
PASS leftFlags is keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_OPEN | keyRange.RIGHT_BOUND
-IDBKeyRange.bound('aae','abe',true,false)
+webkitIDBKeyRange.bound('aae','abe',true,false)
PASS keyRange.left is 'aae'
PASS keyRange.right is 'abe'
PASS leftFlags is keyRange.LEFT_OPEN | keyRange.LEFT_BOUND
PASS rightFlags is keyRange.RIGHT_BOUND
-IDBKeyRange.bound('aaf','abf',true,true)
+webkitIDBKeyRange.bound('aaf','abf',true,true)
PASS keyRange.left is 'aaf'
PASS keyRange.right is 'abf'
PASS leftFlags is keyRange.LEFT_OPEN | keyRange.LEFT_BOUND
diff --git a/LayoutTests/storage/indexeddb/keyrange.html b/LayoutTests/storage/indexeddb/keyrange.html
index d60cb15..c3885fc 100644
--- a/LayoutTests/storage/indexeddb/keyrange.html
+++ b/LayoutTests/storage/indexeddb/keyrange.html
@@ -16,7 +16,7 @@ if (window.layoutTestController)
function checkSingleKeyRange(value)
{
- keyRange = evalAndLog("IDBKeyRange.only(" + value + ")");
+ keyRange = evalAndLog("webkitIDBKeyRange.only(" + value + ")");
shouldBe("keyRange.left", "" + value);
shouldBe("keyRange.right", "" + value);
shouldBe("keyRange.flags", "keyRange.SINGLE");
@@ -24,7 +24,7 @@ function checkSingleKeyRange(value)
function checkLeftBoundKeyRange(value, open)
{
- keyRange = evalAndLog("IDBKeyRange.leftBound(" + value + "," + open + ")");
+ keyRange = evalAndLog("webkitIDBKeyRange.leftBound(" + value + "," + open + ")");
shouldBe("keyRange.left", "" + value);
shouldBeNull("keyRange.right");
shouldBe("keyRange.flags", open ? "keyRange.LEFT_OPEN | keyRange.LEFT_BOUND" : "keyRange.LEFT_BOUND");
@@ -32,7 +32,7 @@ function checkLeftBoundKeyRange(value, open)
function checkRightBoundKeyRange(value, open)
{
- keyRange = evalAndLog("IDBKeyRange.rightBound(" + value + "," + open + ")");
+ keyRange = evalAndLog("webkitIDBKeyRange.rightBound(" + value + "," + open + ")");
shouldBe("keyRange.right", "" + value);
shouldBeNull("keyRange.left");
shouldBe("keyRange.flags", open ? "keyRange.RIGHT_OPEN | keyRange.RIGHT_BOUND" : "keyRange.RIGHT_BOUND");
@@ -40,7 +40,7 @@ function checkRightBoundKeyRange(value, open)
function checkBoundKeyRange(left, right, openLeft, openRight)
{
- keyRange = evalAndLog("IDBKeyRange.bound(" + left + "," + right + "," + openLeft + "," + openRight + ")");
+ keyRange = evalAndLog("webkitIDBKeyRange.bound(" + left + "," + right + "," + openLeft + "," + openRight + ")");
shouldBe("keyRange.left", "" + left);
shouldBe("keyRange.right", "" + right);
leftFlags = keyRange.flags & (keyRange.LEFT_OPEN | keyRange.LEFT_BOUND);
@@ -51,22 +51,22 @@ function checkBoundKeyRange(left, right, openLeft, openRight)
function test()
{
- shouldBeTrue("'SINGLE' in IDBKeyRange");
- shouldBeTrue("'LEFT_OPEN' in IDBKeyRange");
- shouldBeTrue("'RIGHT_OPEN' in IDBKeyRange");
- shouldBeTrue("'LEFT_BOUND' in IDBKeyRange");
- shouldBeTrue("'RIGHT_BOUND' in IDBKeyRange");
- shouldBeFalse("'left' in IDBKeyRange");
- shouldBeFalse("'right' in IDBKeyRange");
- shouldBeFalse("'flags' in IDBKeyRange");
- shouldBeTrue("'only' in IDBKeyRange");
- shouldBeTrue("'leftBound' in IDBKeyRange");
- shouldBeTrue("'rightBound' in IDBKeyRange");
- shouldBeTrue("'bound' in IDBKeyRange");
+ shouldBeTrue("'SINGLE' in webkitIDBKeyRange");
+ shouldBeTrue("'LEFT_OPEN' in webkitIDBKeyRange");
+ shouldBeTrue("'RIGHT_OPEN' in webkitIDBKeyRange");
+ shouldBeTrue("'LEFT_BOUND' in webkitIDBKeyRange");
+ shouldBeTrue("'RIGHT_BOUND' in webkitIDBKeyRange");
+ shouldBeFalse("'left' in webkitIDBKeyRange");
+ shouldBeFalse("'right' in webkitIDBKeyRange");
+ shouldBeFalse("'flags' in webkitIDBKeyRange");
+ shouldBeTrue("'only' in webkitIDBKeyRange");
+ shouldBeTrue("'leftBound' in webkitIDBKeyRange");
+ shouldBeTrue("'rightBound' in webkitIDBKeyRange");
+ shouldBeTrue("'bound' in webkitIDBKeyRange");
debug("");
- var instance = evalAndLog("instance = IDBKeyRange.only(1)");
+ var instance = evalAndLog("instance = webkitIDBKeyRange.only(1)");
shouldBeTrue("'SINGLE' in instance");
shouldBeTrue("'LEFT_OPEN' in instance");
shouldBeTrue("'RIGHT_OPEN' in instance");
diff --git a/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt b/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
index 6ff87c8..e14e791 100644
--- a/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
@@ -3,7 +3,7 @@ Test the basics of IndexedDB's IDBObjectStore.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('name', 'description')
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
@@ -131,7 +131,7 @@ PASS 'onerror' in event.target is true
PASS 'readyState' in event.target is true
PASS event.target.readyState is event.target.DONE
-PASS event.code is IDBDatabaseException.UNKNOWN_ERR
+PASS event.code is webkitIDBDatabaseException.UNKNOWN_ERR
db.transaction()
store = transaction.objectStore('storeName')
store.get('key')
diff --git a/LayoutTests/storage/indexeddb/objectstore-basics.html b/LayoutTests/storage/indexeddb/objectstore-basics.html
index 130f82a..e50bb27 100644
--- a/LayoutTests/storage/indexeddb/objectstore-basics.html
+++ b/LayoutTests/storage/indexeddb/objectstore-basics.html
@@ -16,7 +16,7 @@ if (window.layoutTestController)
function test()
{
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openSuccess;
result.onerror = unexpectedErrorCallback;
@@ -159,7 +159,7 @@ function addAgainFailure()
debug("addAgainFailure():");
verifyErrorEvent(event);
// FIXME: This error code needs to be specced.
- shouldBe("event.code", "IDBDatabaseException.UNKNOWN_ERR");
+ shouldBe("event.code", "webkitIDBDatabaseException.UNKNOWN_ERR");
transaction = evalAndLog("db.transaction()");
transaction.onabort = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt b/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt
index ffe6cd7..881fe92 100644
--- a/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt
+++ b/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt
@@ -3,7 +3,7 @@ Test IndexedDB's objectStore.openCursor + the cursor it produces in depth.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('someDB', 'some description')
+webkitIndexedDB.open('someDB', 'some description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/objectstore-cursor.html b/LayoutTests/storage/indexeddb/objectstore-cursor.html
index 92c1a7c..d9ad805 100644
--- a/LayoutTests/storage/indexeddb/objectstore-cursor.html
+++ b/LayoutTests/storage/indexeddb/objectstore-cursor.html
@@ -28,7 +28,7 @@ window.testData = [
function openDatabase()
{
- result = evalAndLog("indexedDB.open('someDB', 'some description')");
+ result = evalAndLog("webkitIndexedDB.open('someDB', 'some description')");
verifyResult(result);
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
@@ -158,13 +158,13 @@ function runNextTest()
var keyRange;
if (lower !== null && upper !== null)
- keyRange = IDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
+ keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
else if (lower !== null)
- keyRange = IDBKeyRange.leftBound(testData[lower], lowerIsOpen);
+ keyRange = webkitIDBKeyRange.leftBound(testData[lower], lowerIsOpen);
else
- keyRange = IDBKeyRange.rightBound(testData[upper], upperIsOpen);
+ keyRange = webkitIDBKeyRange.rightBound(testData[upper], upperIsOpen);
- // FIXME: Should be IDBCursor.NEXT : IDBCursor.PREV, but we can't do that yet.
+ // FIXME: Should be webkitIDBCursor.NEXT : webkitIDBCursor.PREV, but we can't do that yet.
var request = objectStore.openCursor(keyRange, ascending ? 0 : 2);
request.onsuccess = cursorIteration;
request.onerror = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt
index 38458bd..50aede5 100644
--- a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt
+++ b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt
@@ -1,9 +1,9 @@
-Test IndexedDB's IDBObjectStore.removeObjectStore().
+Test IndexedDB's webkitIDBObjectStore.removeObjectStore().
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('name', 'description')
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
index 3877b1e..1067d75 100644
--- a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
+++ b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
@@ -10,13 +10,13 @@
<div id="console"></div>
<script>
-description("Test IndexedDB's IDBObjectStore.removeObjectStore().");
+description("Test IndexedDB's webkitIDBObjectStore.removeObjectStore().");
if (window.layoutTestController)
layoutTestController.waitUntilDone();
function test()
{
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = startSetVersion;
result.onerror = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/open-cursor-expected.txt b/LayoutTests/storage/indexeddb/open-cursor-expected.txt
index 0e55be7..1bca527 100644
--- a/LayoutTests/storage/indexeddb/open-cursor-expected.txt
+++ b/LayoutTests/storage/indexeddb/open-cursor-expected.txt
@@ -3,7 +3,7 @@ Test IndexedDB's openCursor.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB.open('name', 'description')
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/open-cursor.html b/LayoutTests/storage/indexeddb/open-cursor.html
index d4a9068..ec62f2c 100644
--- a/LayoutTests/storage/indexeddb/open-cursor.html
+++ b/LayoutTests/storage/indexeddb/open-cursor.html
@@ -25,7 +25,7 @@ function emptyCursorSuccess()
function openEmptyCursor()
{
debug("Opening an empty cursor.");
- keyRange = IDBKeyRange.leftBound("InexistentKey");
+ keyRange = webkitIDBKeyRange.leftBound("InexistentKey");
result = evalAndLog("objectStore.openCursor(keyRange)");
verifyResult(result);
result.onsuccess = emptyCursorSuccess;
@@ -47,7 +47,7 @@ function cursorSuccess()
function openCursor()
{
debug("Opening cursor");
- keyRange = IDBKeyRange.leftBound("myKey");
+ keyRange = webkitIDBKeyRange.leftBound("myKey");
result = evalAndLog("event.source.openCursor(keyRange)");
verifyResult(result);
result.onsuccess = cursorSuccess;
@@ -87,7 +87,7 @@ function openSuccess()
function test()
{
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openSuccess;
result.onerror = unexpectedErrorCallback;
diff --git a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
index 1a18eed..b493946 100644
--- a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
@@ -3,9 +3,9 @@ Test IndexedDB transaction basics.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS 'indexedDB' in window is true
-PASS indexedDB == null is false
-indexedDB.open('name', 'description')
+PASS 'webkitIndexedDB' in window is true
+PASS webkitIndexedDB == null is false
+webkitIndexedDB.open('name', 'description')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
PASS 'readyState' in result is true
diff --git a/LayoutTests/storage/indexeddb/transaction-basics.html b/LayoutTests/storage/indexeddb/transaction-basics.html
index 2461a8c..07fc685 100644
--- a/LayoutTests/storage/indexeddb/transaction-basics.html
+++ b/LayoutTests/storage/indexeddb/transaction-basics.html
@@ -16,10 +16,10 @@ if (window.layoutTestController)
function test()
{
- shouldBeTrue("'indexedDB' in window");
- shouldBeFalse("indexedDB == null");
+ shouldBeTrue("'webkitIndexedDB' in window");
+ shouldBeFalse("webkitIndexedDB == null");
- result = evalAndLog("indexedDB.open('name', 'description')");
+ result = evalAndLog("webkitIndexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openSuccess;
result.onerror = unexpectedErrorCallback;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f0cad53..209da1a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2010-10-11 Andrei Popescu <andreip at google.com>
+
+ Reviewed by Jeremy Orlow.
+
+ The names of IndexedDB-specific attributes of DOMWindow should be prefixed with 'webkit'.
+ https://bugs.webkit.org/show_bug.cgi?id=47508
+
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setWebkitIndexedDBEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIndexedDBEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBCursorEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBDatabaseEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBDatabaseErrorEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBDatabaseExceptionEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBErrorEventEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBEventEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBFactoryEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBIndexEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBKeyRangeEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBObjectStoreEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBRequestEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBSuccessEventEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitIDBTransactionEnabled):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::webkitIndexedDB):
+ * page/DOMWindow.h:
+ * page/DOMWindow.idl:
+
2010-10-11 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index f73b922..1054f64 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -54,21 +54,21 @@ public:
static void setGeolocationEnabled(bool isEnabled) { isGeolocationEnabled = isEnabled; }
static bool geolocationEnabled() { return isGeolocationEnabled; }
- static void setIndexedDBEnabled(bool isEnabled) { isIndexedDBEnabled = isEnabled; }
- static bool indexedDBEnabled() { return isIndexedDBEnabled; }
- static bool iDBCursorEnabled() { return isIndexedDBEnabled; }
- static bool iDBDatabaseEnabled() { return isIndexedDBEnabled; }
- static bool iDBDatabaseErrorEnabled() { return isIndexedDBEnabled; }
- static bool iDBDatabaseExceptionEnabled() { return isIndexedDBEnabled; }
- static bool iDBErrorEventEnabled() { return isIndexedDBEnabled; }
- static bool iDBEventEnabled() { return isIndexedDBEnabled; }
- static bool iDBFactoryEnabled() { return isIndexedDBEnabled; }
- static bool iDBIndexEnabled() { return isIndexedDBEnabled; }
- static bool iDBKeyRangeEnabled() { return isIndexedDBEnabled; }
- static bool iDBObjectStoreEnabled() { return isIndexedDBEnabled; }
- static bool iDBRequestEnabled() { return isIndexedDBEnabled; }
- static bool iDBSuccessEventEnabled() { return isIndexedDBEnabled; }
- static bool iDBTransactionEnabled() { return isIndexedDBEnabled; }
+ static void setWebkitIndexedDBEnabled(bool isEnabled) { isIndexedDBEnabled = isEnabled; }
+ static bool webkitIndexedDBEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBCursorEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBDatabaseEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBDatabaseErrorEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBDatabaseExceptionEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBErrorEventEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBEventEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBFactoryEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBIndexEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBKeyRangeEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBObjectStoreEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBRequestEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBSuccessEventEnabled() { return isIndexedDBEnabled; }
+ static bool webkitIDBTransactionEnabled() { return isIndexedDBEnabled; }
#if ENABLE(VIDEO)
static bool audioEnabled();
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 408ba6a..d9c4ac9 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -700,7 +700,7 @@ void DOMWindow::pageDestroyed()
}
#if ENABLE(INDEXED_DATABASE)
-IDBFactory* DOMWindow::indexedDB() const
+IDBFactory* DOMWindow::webkitIndexedDB() const
{
if (m_idbFactory)
return m_idbFactory.get();
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h
index ca45f54..e958b38 100644
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -234,7 +234,7 @@ namespace WebCore {
void pageDestroyed();
#if ENABLE(INDEXED_DATABASE)
- IDBFactory* indexedDB() const;
+ IDBFactory* webkitIndexedDB() const;
#endif
#if ENABLE(FILE_SYSTEM)
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 86b72e5..507b6bf 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -173,21 +173,21 @@ module window {
readonly attribute [EnabledAtRuntime] NotificationCenter webkitNotifications;
#endif
#if defined(ENABLE_INDEXED_DATABASE) && ENABLE_INDEXED_DATABASE
- readonly attribute [EnabledAtRuntime] IDBFactory indexedDB;
-
- attribute [EnabledAtRuntime] IDBCursorConstructor IDBCursor;
- attribute [EnabledAtRuntime] IDBDatabaseConstructor IDBDatabase;
- attribute [EnabledAtRuntime] IDBDatabaseErrorConstructor IDBDatabaseError;
- attribute [EnabledAtRuntime] IDBDatabaseExceptionConstructor IDBDatabaseException;
- attribute [EnabledAtRuntime] IDBErrorEventConstructor IDBErrorEvent;
- attribute [EnabledAtRuntime] IDBEventConstructor IDBEvent;
- attribute [EnabledAtRuntime] IDBFactoryConstructor IDBFactory;
- attribute [EnabledAtRuntime] IDBIndexConstructor IDBIndex;
- attribute [EnabledAtRuntime] IDBKeyRangeConstructor IDBKeyRange;
- attribute [EnabledAtRuntime] IDBObjectStoreConstructor IDBObjectStore;
- attribute [EnabledAtRuntime] IDBRequestConstructor IDBRequest;
- attribute [EnabledAtRuntime] IDBSuccessEventConstructor IDBSuccessEvent;
- attribute [EnabledAtRuntime] IDBTransactionConstructor IDBTransaction;
+ readonly attribute [EnabledAtRuntime] IDBFactory webkitIndexedDB;
+
+ attribute [EnabledAtRuntime] IDBCursorConstructor webkitIDBCursor;
+ attribute [EnabledAtRuntime] IDBDatabaseConstructor webkitIDBDatabase;
+ attribute [EnabledAtRuntime] IDBDatabaseErrorConstructor webkitIDBDatabaseError;
+ attribute [EnabledAtRuntime] IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
+ attribute [EnabledAtRuntime] IDBErrorEventConstructor webkitIDBErrorEvent;
+ attribute [EnabledAtRuntime] IDBEventConstructor webkitIDBEvent;
+ attribute [EnabledAtRuntime] IDBFactoryConstructor webkitIDBFactory;
+ attribute [EnabledAtRuntime] IDBIndexConstructor webkitIDBIndex;
+ attribute [EnabledAtRuntime] IDBKeyRangeConstructor webkitIDBKeyRange;
+ attribute [EnabledAtRuntime] IDBObjectStoreConstructor webkitIDBObjectStore;
+ attribute [EnabledAtRuntime] IDBRequestConstructor webkitIDBRequest;
+ attribute [EnabledAtRuntime] IDBSuccessEventConstructor webkitIDBSuccessEvent;
+ attribute [EnabledAtRuntime] IDBTransactionConstructor webkitIDBTransaction;
#endif
#if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM
const unsigned short TEMPORARY = 0;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 740ad39..b07fbb8 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-11 Andrei Popescu <andreip at google.com>
+
+ Reviewed by Jeremy Orlow.
+
+ The names of IndexedDB-specific attributes of DOMWindow should be prefixed with 'webkit'.
+ https://bugs.webkit.org/show_bug.cgi?id=47508
+
+ * src/WebRuntimeFeatures.cpp:
+ (WebKit::WebRuntimeFeatures::enableIndexedDatabase):
+ (WebKit::WebRuntimeFeatures::isIndexedDatabaseEnabled):
+
2010-10-11 Tony Chang <tony at chromium.org>
Unreviewed, roll chromium DEPS to pick up Dave's fix for
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index 2279eeb..edb0413 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -171,14 +171,14 @@ bool WebRuntimeFeatures::isGeolocationEnabled()
void WebRuntimeFeatures::enableIndexedDatabase(bool enable)
{
#if ENABLE(INDEXED_DATABASE)
- RuntimeEnabledFeatures::setIndexedDBEnabled(enable);
+ RuntimeEnabledFeatures::setWebkitIndexedDBEnabled(enable);
#endif
}
bool WebRuntimeFeatures::isIndexedDatabaseEnabled()
{
#if ENABLE(INDEXED_DATABASE)
- return RuntimeEnabledFeatures::indexedDBEnabled();
+ return RuntimeEnabledFeatures::webkitIndexedDBEnabled();
#else
return false;
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list