Commit b420c1d2 authored by jsbell@chromium.org's avatar jsbell@chromium.org

Deprecate the webkit-prefixed standard IndexedDB entry points

We've shipped unprefixed (e.g. indexedDB, IDBKeyRange, etc) for almost
two years. Time to at least try to wean the web off of them.

Intent to Deprecate:
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/6TD2jjqAJs0

Review URL: https://codereview.chromium.org/415753002

git-svn-id: svn://svn.chromium.org/blink/trunk@179058 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 0a064cb3
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Tests access of cached DOMWindow properties after the associated frame is navigated. Test should not crash and properties should be set to sane defaults. Tests access of cached DOMWindow properties after the associated frame is navigated. Test should not crash and properties should be set to sane defaults.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Tests access of cached DOMWindow properties after the associated frame is removed from a web page and garbage collected. Test should not crash and properties should be set to sane defaults. Tests access of cached DOMWindow properties after the associated frame is removed from a web page and garbage collected. Test should not crash and properties should be set to sane defaults.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Tests access of cached DOMWindow properties after the associated frame is no longer in a web page. Test should not crash and properties should be set to sane defaults. Tests access of cached DOMWindow properties after the associated frame is no longer in a web page. Test should not crash and properties should be set to sane defaults.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Tests property access on a cached DOMWindow after the associated frame is navigated. Test should not crash and properties read from the cached DOMWindow should be identical to properties through the 'current' DOMWindow. Tests property access on a cached DOMWindow after the associated frame is navigated. Test should not crash and properties read from the cached DOMWindow should be identical to properties through the 'current' DOMWindow.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Tests property access on a cached DOMWindow after the associated frame is removed from a web page and garbage collected. Test should not crash and properties should be set to sane defaults. Tests property access on a cached DOMWindow after the associated frame is removed from a web page and garbage collected. Test should not crash and properties should be set to sane defaults.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Tests property access on a cached DOMWindow after the associated frame is no longer in a web page. Test should not crash and properties should be set to sane defaults. Tests property access on a cached DOMWindow after the associated frame is no longer in a web page. Test should not crash and properties should be set to sane defaults.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIDBTransaction' is deprecated. Please use 'IDBTransaction' instead.
CONSOLE WARNING: 'webkitIDBRequest' is deprecated. Please use 'IDBRequest' instead.
CONSOLE WARNING: 'webkitIDBObjectStore' is deprecated. Please use 'IDBObjectStore' instead.
CONSOLE WARNING: 'webkitIDBKeyRange' is deprecated. Please use 'IDBKeyRange' instead.
CONSOLE WARNING: 'webkitIDBIndex' is deprecated. Please use 'IDBIndex' instead.
CONSOLE WARNING: 'webkitIDBFactory' is deprecated. Please use 'IDBFactory' instead.
CONSOLE WARNING: 'webkitIDBDatabase' is deprecated. Please use 'IDBDatabase' instead.
CONSOLE WARNING: 'webkitIDBCursor' is deprecated. Please use 'IDBCursor' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Make sure prototypes are set up using the window a property came from, instead of the lexical global object. Make sure prototypes are set up using the window a property came from, instead of the lexical global object.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Test for bug 8131: Some properties and methods of window and document objects cannot be converted to a string. Test for bug 8131: Some properties and methods of window and document objects cannot be converted to a string.
Should say SUCCESS: Should say SUCCESS:
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIDBTransaction' is deprecated. Please use 'IDBTransaction' instead.
CONSOLE WARNING: 'webkitIDBRequest' is deprecated. Please use 'IDBRequest' instead.
CONSOLE WARNING: 'webkitIDBObjectStore' is deprecated. Please use 'IDBObjectStore' instead.
CONSOLE WARNING: 'webkitIDBKeyRange' is deprecated. Please use 'IDBKeyRange' instead.
CONSOLE WARNING: 'webkitIDBIndex' is deprecated. Please use 'IDBIndex' instead.
CONSOLE WARNING: 'webkitIDBFactory' is deprecated. Please use 'IDBFactory' instead.
CONSOLE WARNING: 'webkitIDBDatabase' is deprecated. Please use 'IDBDatabase' instead.
CONSOLE WARNING: 'webkitIDBCursor' is deprecated. Please use 'IDBCursor' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
This test documents our set of global constructors we expose on the window object (FF and Opera don't expose them on the window, btw). This also checks to make sure than any constructor attribute we expose has the expected constructor type. This test documents our set of global constructors we expose on the window object (FF and Opera don't expose them on the window, btw). This also checks to make sure than any constructor attribute we expose has the expected constructor type.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback1 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback1
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback2 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback2
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback3 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback3
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback4 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback4
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback5 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback5
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback6 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback6
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback7 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback7
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback8 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback8
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback9 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback9
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback10 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback10
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback11 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback11
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback12 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback12
Tests that data is correctly loaded by IndexedDBModel from IndexedDB object store and index. Tests that data is correctly loaded by IndexedDBModel from IndexedDB object store and index.
Dumping values, fromIndex = false, skipCount = 0, pageSize = 2, idbKeyRange = null Dumping values, fromIndex = false, skipCount = 0, pageSize = 2, idbKeyRange = null
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<script> <script>
function test() function test()
{ {
var IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange;
var indexedDBModel = new WebInspector.IndexedDBModel(WebInspector.targetManager.mainTarget()); var indexedDBModel = new WebInspector.IndexedDBModel(WebInspector.targetManager.mainTarget());
var mainFrameId = WebInspector.resourceTreeModel.mainFrame.id; var mainFrameId = WebInspector.resourceTreeModel.mainFrame.id;
var securityOrigin = "http://127.0.0.1:8000"; var securityOrigin = "http://127.0.0.1:8000";
......
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback1 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback1
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback2 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback2
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback3 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback3
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback4 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback4
Tests that database names are correctly loaded and saved in IndexedDBModel. Tests that database names are correctly loaded and saved in IndexedDBModel.
Dumping database names: Dumping database names:
......
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback1 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback1
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback2 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback2
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback3 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback3
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback4 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback4
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback5 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback5
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback6 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback6
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback7 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback7
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback8 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback8
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback9 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback9
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback10 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback10
Tests that database names are correctly loaded and saved in IndexedDBModel. Tests that database names are correctly loaded and saved in IndexedDBModel.
Dumping database: Dumping database:
......
...@@ -100,9 +100,6 @@ InspectorTest.addIDBValue = function(frameId, databaseName, objectStoreName, val ...@@ -100,9 +100,6 @@ InspectorTest.addIDBValue = function(frameId, databaseName, objectStoreName, val
}; };
var indexedDB = window.indexeddb || window.webkitIndexedDB;
window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction;
function dispatchCallback(callbackId) function dispatchCallback(callbackId)
{ {
console.log(callbackId); console.log(callbackId);
...@@ -256,4 +253,3 @@ function addIDBValue(callback, databaseName, objectStoreName, value, key) ...@@ -256,4 +253,3 @@ function addIDBValue(callback, databaseName, objectStoreName, value, key)
request.onsuccess = commitCallback; request.onsuccess = commitCallback;
} }
} }
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback1 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback1
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback2 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback2
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback3 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback3
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback4 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback4
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback5 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback5
CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback6 CONSOLE MESSAGE: line 105: InspectorTest.IndexedDB_callback6
Tests IndexedDB tree element on resources panel. Tests IndexedDB tree element on resources panel.
Expanded IndexedDB tree element. Expanded IndexedDB tree element.
......
...@@ -5,15 +5,15 @@ Both of these frames should successfully open the database: ...@@ -5,15 +5,15 @@ Both of these frames should successfully open the database:
-------- --------
Frame: '<!--framePath //<!--frame0-->-->' Frame: '<!--framePath //<!--frame0-->-->'
-------- --------
Successfully called window.webkitIndexedDB.deleteDatabase(). Successfully called window.indexedDB.deleteDatabase().
Successfully called window.webkitIndexedDB.open(). Successfully called window.indexedDB.open().
Successfully called window.webkitIndexedDB.webkitGetDatabaseNames(). Successfully called window.indexedDB.webkitGetDatabaseNames().
-------- --------
Frame: '<!--framePath //<!--frame1-->-->' Frame: '<!--framePath //<!--frame1-->-->'
-------- --------
Successfully called window.webkitIndexedDB.deleteDatabase(). Successfully called window.indexedDB.deleteDatabase().
Successfully called window.webkitIndexedDB.open(). Successfully called window.indexedDB.open().
Successfully called window.webkitIndexedDB.webkitGetDatabaseNames(). Successfully called window.indexedDB.webkitGetDatabaseNames().
...@@ -5,15 +5,15 @@ Both of these frames should successfully open the database: ...@@ -5,15 +5,15 @@ Both of these frames should successfully open the database:
-------- --------
Frame: '<!--framePath //<!--frame0-->-->' Frame: '<!--framePath //<!--frame0-->-->'
-------- --------
Successfully called self.webkitIndexedDB.deleteDatabase(). Successfully called self.indexedDB.deleteDatabase().
Successfully called self.webkitIndexedDB.open(). Successfully called self.indexedDB.open().
Successfully called self.webkitIndexedDB.webkitGetDatabaseNames(). Successfully called self.indexedDB.webkitGetDatabaseNames().
-------- --------
Frame: '<!--framePath //<!--frame1-->-->' Frame: '<!--framePath //<!--frame1-->-->'
-------- --------
Successfully called self.webkitIndexedDB.deleteDatabase(). Successfully called self.indexedDB.deleteDatabase().
Successfully called self.webkitIndexedDB.open(). Successfully called self.indexedDB.open().
Successfully called self.webkitIndexedDB.webkitGetDatabaseNames(). Successfully called self.indexedDB.webkitGetDatabaseNames().
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Done. Done.
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Done. Done.
ALERT: PASS: db.open() threw a SECURITY_ERR! ALERT: PASS: indexedDB.open() threw a SECURITY_ERR!
...@@ -5,15 +5,14 @@ if (window.testRunner) ...@@ -5,15 +5,14 @@ if (window.testRunner)
<iframe sandbox="allow-scripts" <iframe sandbox="allow-scripts"
src="data:text/html, src="data:text/html,
<script> <script>
var db = window.webkitIndexedDB;
try { try {
db.open('test'); indexedDB.open('test');
alert('FAIL: db.open() should throw a SECURITY_ERR in a sandbox.'); alert('FAIL: indexedDB.open() should throw a SECURITY_ERR in a sandbox.');
} catch (e) { } catch (e) {
if (e.code === DOMException.SECURITY_ERR) if (e.code === DOMException.SECURITY_ERR)
alert('PASS: db.open() threw a SECURITY_ERR!'); alert('PASS: indexedDB.open() threw a SECURITY_ERR!');
else else
alert('FAIL: db.open() threw a ' + e.name); alert('FAIL: indexedDB.open() threw a ' + e.name);
} }
</script>" </script>"
></iframe> ></iframe>
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<script> <script>
function test(method, args) { function test(method, args) {
try { try {
var request = window.webkitIndexedDB[method].call(window.webkitIndexedDB, args); var request = window.indexedDB[method].call(window.indexedDB, args);
document.write('Successfully called window.webkitIndexedDB.' + method + '().<br>'); document.write('Successfully called window.indexedDB.' + method + '().<br>');
} catch (exception) { } catch (exception) {
document.write('window.webkitIndexedDB.' + method + '() threw an exception: ' + exception.name + '<br>'); document.write('window.indexedDB.' + method + '() threw an exception: ' + exception.name + '<br>');
} }
} }
test('deleteDatabase', 'testDBName'); test('deleteDatabase', 'testDBName');
......
self.onmessage = function() { self.onmessage = function() {
function test(method, args) { function test(method, args) {
try { try {
var request = self.webkitIndexedDB[method].call(self.webkitIndexedDB, args); var request = self.indexedDB[method].call(self.indexedDB, args);
return 'Successfully called self.webkitIndexedDB.' + method + '().<br>'; return 'Successfully called self.indexedDB.' + method + '().<br>';
} catch (exception) { } catch (exception) {
return 'self.webkitIndexedDB.' + method + '() threw an exception: ' + exception.name + '<br>'; return 'self.indexedDB.' + method + '() threw an exception: ' + exception.name + '<br>';
} }
} }
self.postMessage({ self.postMessage({
......
Test IndexedDB's webkitIndexedDB.deleteDatabase(). Test IndexedDB's indexedDB.deleteDatabase().
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
Test the basics of IndexedDB's webkitIDBIndex. Test the basics of IndexedDB's IDBIndex.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
[Worker] Test the basics of IndexedDB's webkitIDBIndex. [Worker] Test the basics of IndexedDB's IDBIndex.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
Test IndexedDB's webkitIDBIndex.openCursor + the cursor it produces in depth. Test IndexedDB's IDBIndex.openCursor + the cursor it produces in depth.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
Test IndexedDB's webkitIDBObjectStore.clear(). Test IndexedDB's IDBObjectStore.clear().
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
Test IndexedDB's webkitIDBObjectStore.deleteObjectStore(). Test IndexedDB's IDBObjectStore.deleteObjectStore().
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
...@@ -3,7 +3,7 @@ if (this.importScripts) { ...@@ -3,7 +3,7 @@ if (this.importScripts) {
importScripts('shared.js'); importScripts('shared.js');
} }
description("Test IndexedDB's webkitIndexedDB.deleteDatabase()."); description("Test IndexedDB's indexedDB.deleteDatabase().");
indexedDBTest(prepareDatabase, getValue); indexedDBTest(prepareDatabase, getValue);
function prepareDatabase() function prepareDatabase()
......
...@@ -3,7 +3,7 @@ if (this.importScripts) { ...@@ -3,7 +3,7 @@ if (this.importScripts) {
importScripts('shared.js'); importScripts('shared.js');
} }
description("Test the basics of IndexedDB's webkitIDBIndex."); description("Test the basics of IndexedDB's IDBIndex.");
indexedDBTest(prepareDatabase); indexedDBTest(prepareDatabase);
function prepareDatabase(evt) function prepareDatabase(evt)
......
...@@ -3,7 +3,7 @@ if (this.importScripts) { ...@@ -3,7 +3,7 @@ if (this.importScripts) {
importScripts('shared.js'); importScripts('shared.js');
} }
description("Test IndexedDB's webkitIDBIndex.openCursor + the cursor it produces in depth."); description("Test IndexedDB's IDBIndex.openCursor + the cursor it produces in depth.");
// In order of how it should be sorted by IndexedDB. // In order of how it should be sorted by IndexedDB.
self.testData = [ self.testData = [
......
...@@ -3,7 +3,7 @@ if (this.importScripts) { ...@@ -3,7 +3,7 @@ if (this.importScripts) {
importScripts('shared.js'); importScripts('shared.js');
} }
description("Test IndexedDB's webkitIDBObjectStore.clear()."); description("Test IndexedDB's IDBObjectStore.clear().");
indexedDBTest(prepareDatabase, setVersionComplete); indexedDBTest(prepareDatabase, setVersionComplete);
function prepareDatabase() function prepareDatabase()
......
...@@ -3,7 +3,7 @@ if (this.importScripts) { ...@@ -3,7 +3,7 @@ if (this.importScripts) {
importScripts('shared.js'); importScripts('shared.js');
} }
description("Test IndexedDB's webkitIDBObjectStore.deleteObjectStore()."); description("Test IndexedDB's IDBObjectStore.deleteObjectStore().");
indexedDBTest(prepareDatabase, getValue); indexedDBTest(prepareDatabase, getValue);
function prepareDatabase() function prepareDatabase()
......
...@@ -26,15 +26,6 @@ if (self.importScripts && !self.postMessage) { ...@@ -26,15 +26,6 @@ if (self.importScripts && !self.postMessage) {
function removeVendorPrefixes() function removeVendorPrefixes()
{ {
IDBCursor = self.IDBCursor || self.webkitIDBCursor;
IDBDatabase = self.IDBDatabase || self.webkitIDBDatabase;
IDBFactory = self.IDBFactory || self.webkitIDBFactory;
IDBIndex = self.IDBIndex || self.webkitIDBIndex;
IDBKeyRange = self.IDBKeyRange || self.webkitIDBKeyRange;
IDBObjectStore = self.IDBObjectStore || self.webkitIDBObjectStore;
IDBRequest = self.IDBRequest || self.webkitIDBRequest;
IDBTransaction = self.IDBTransaction || self.webkitIDBTransaction;
indexedDB = evalAndLog("indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;"); indexedDB = evalAndLog("indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;");
debug(""); debug("");
} }
......
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
Check that IDBFactory is available through the prefixed or unprefixed entry point. Check that IDBFactory is available through the prefixed or unprefixed entry point.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
[Worker] Check that IDBFactory is available through the prefixed or unprefixed entry point. [Worker] Check that IDBFactory is available through the prefixed or unprefixed entry point.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'webkitIDBTransaction' is deprecated. Please use 'IDBTransaction' instead.
CONSOLE WARNING: 'webkitIDBRequest' is deprecated. Please use 'IDBRequest' instead.
CONSOLE WARNING: 'webkitIDBObjectStore' is deprecated. Please use 'IDBObjectStore' instead.
CONSOLE WARNING: 'webkitIDBKeyRange' is deprecated. Please use 'IDBKeyRange' instead.
CONSOLE WARNING: 'webkitIDBIndex' is deprecated. Please use 'IDBIndex' instead.
CONSOLE WARNING: 'webkitIDBFactory' is deprecated. Please use 'IDBFactory' instead.
CONSOLE WARNING: 'webkitIDBDatabase' is deprecated. Please use 'IDBDatabase' instead.
CONSOLE WARNING: 'webkitIDBCursor' is deprecated. Please use 'IDBCursor' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
This test documents the Constructor properties on DedicatedWorkerGlobalScope. This test documents the Constructor properties on DedicatedWorkerGlobalScope.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIDBTransaction' is deprecated. Please use 'IDBTransaction' instead.
CONSOLE WARNING: 'webkitIDBRequest' is deprecated. Please use 'IDBRequest' instead.
CONSOLE WARNING: 'webkitIDBObjectStore' is deprecated. Please use 'IDBObjectStore' instead.
CONSOLE WARNING: 'webkitIDBKeyRange' is deprecated. Please use 'IDBKeyRange' instead.
CONSOLE WARNING: 'webkitIDBIndex' is deprecated. Please use 'IDBIndex' instead.
CONSOLE WARNING: 'webkitIDBFactory' is deprecated. Please use 'IDBFactory' instead.
CONSOLE WARNING: 'webkitIDBDatabase' is deprecated. Please use 'IDBDatabase' instead.
CONSOLE WARNING: 'webkitIDBCursor' is deprecated. Please use 'IDBCursor' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
This test documents the Constructor properties on the global window object. This test documents the Constructor properties on the global window object.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'webkitIDBTransaction' is deprecated. Please use 'IDBTransaction' instead.
CONSOLE WARNING: 'webkitIDBRequest' is deprecated. Please use 'IDBRequest' instead.
CONSOLE WARNING: 'webkitIDBObjectStore' is deprecated. Please use 'IDBObjectStore' instead.
CONSOLE WARNING: 'webkitIDBKeyRange' is deprecated. Please use 'IDBKeyRange' instead.
CONSOLE WARNING: 'webkitIDBIndex' is deprecated. Please use 'IDBIndex' instead.
CONSOLE WARNING: 'webkitIDBFactory' is deprecated. Please use 'IDBFactory' instead.
CONSOLE WARNING: 'webkitIDBDatabase' is deprecated. Please use 'IDBDatabase' instead.
CONSOLE WARNING: 'webkitIDBCursor' is deprecated. Please use 'IDBCursor' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
This test documents the Constructor properties on DedicatedWorkerGlobalScope. This test documents the Constructor properties on DedicatedWorkerGlobalScope.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead. CONSOLE WARNING: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
CONSOLE WARNING: 'webkitIDBTransaction' is deprecated. Please use 'IDBTransaction' instead.
CONSOLE WARNING: 'webkitIDBRequest' is deprecated. Please use 'IDBRequest' instead.
CONSOLE WARNING: 'webkitIDBObjectStore' is deprecated. Please use 'IDBObjectStore' instead.
CONSOLE WARNING: 'webkitIDBKeyRange' is deprecated. Please use 'IDBKeyRange' instead.
CONSOLE WARNING: 'webkitIDBIndex' is deprecated. Please use 'IDBIndex' instead.
CONSOLE WARNING: 'webkitIDBFactory' is deprecated. Please use 'IDBFactory' instead.
CONSOLE WARNING: 'webkitIDBDatabase' is deprecated. Please use 'IDBDatabase' instead.
CONSOLE WARNING: 'webkitIDBCursor' is deprecated. Please use 'IDBCursor' instead.
CONSOLE WARNING: 'webkitIndexedDB' is deprecated. Please use 'indexedDB' instead.
This test documents the Constructor properties on the global window object. This test documents the Constructor properties on the global window object.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script> <script>
if (!('webkitIndexedDB' in window)) if (!('indexedDB' in window))
document.getElementById("enabled").innerHTML = "<font color=red>Your build does NOT seem to have it enabled. So all code on this page is disabled.</font>"; document.getElementById("enabled").innerHTML = "<font color=red>Your build does NOT seem to have it enabled. So all code on this page is disabled.</font>";
else else
document.getElementById("enabled").innerHTML = "<font color=green>Your build seems to have it enabled.</font>"; document.getElementById("enabled").innerHTML = "<font color=green>Your build seems to have it enabled.</font>";
...@@ -30,7 +30,7 @@ function setData() ...@@ -30,7 +30,7 @@ function setData()
{ {
status("Something must have gone wrong (or we're still working)...", "red"); status("Something must have gone wrong (or we're still working)...", "red");
webkitIndexedDB.open("someDB", "some description").onsuccess = function() { indexedDB.open("someDB", "some description").onsuccess = function() {
event.result.setVersion("some version").onsuccess = function() { event.result.setVersion("some version").onsuccess = function() {
var db = event.source; var db = event.source;
while (db.objectStoreNames.length) while (db.objectStoreNames.length)
...@@ -46,7 +46,7 @@ function verifyData() ...@@ -46,7 +46,7 @@ function verifyData()
{ {
status("Something must have gone wrong (or we're still working)...", "red"); status("Something must have gone wrong (or we're still working)...", "red");
webkitIndexedDB.open("someDB", "some description").onsuccess = function() { indexedDB.open("someDB", "some description").onsuccess = function() {
try { try {
var result = event.result.transaction([]).objectStore("test").get("key"); var result = event.result.transaction([]).objectStore("test").get("key");
result.onsuccess = function() { result.onsuccess = function() {
......
...@@ -638,6 +638,12 @@ void UseCounter::countDeprecation(const Document& document, Feature feature) ...@@ -638,6 +638,12 @@ void UseCounter::countDeprecation(const Document& document, Feature feature)
} }
} }
// FIXME: Update other UseCounter::deprecationMessage() cases to use this.
static String replacedBy(const char* oldString, const char* newString)
{
return String::format("'%s' is deprecated. Please use '%s' instead.", oldString, newString);
}
String UseCounter::deprecationMessage(Feature feature) String UseCounter::deprecationMessage(Feature feature)
{ {
switch (feature) { switch (feature) {
...@@ -647,7 +653,7 @@ String UseCounter::deprecationMessage(Feature feature) ...@@ -647,7 +653,7 @@ String UseCounter::deprecationMessage(Feature feature)
// Keyboard Event (DOM Level 3) // Keyboard Event (DOM Level 3)
case KeyboardEventKeyLocation: case KeyboardEventKeyLocation:
return "'KeyboardEvent.keyLocation' is deprecated. Please use 'KeyboardEvent.location' instead."; return replacedBy("KeyboardEvent.keyLocation", "KeyboardEvent.location");
case ConsoleMarkTimeline: case ConsoleMarkTimeline:
return "console.markTimeline is deprecated. Please use the console.timeStamp instead."; return "console.markTimeline is deprecated. Please use the console.timeStamp instead.";
...@@ -683,7 +689,34 @@ String UseCounter::deprecationMessage(Feature feature) ...@@ -683,7 +689,34 @@ String UseCounter::deprecationMessage(Feature feature)
return "'MediaError.MEDIA_ERR_ENCRYPTED' is deprecated. This error code is never used."; return "'MediaError.MEDIA_ERR_ENCRYPTED' is deprecated. This error code is never used.";
case PrefixedGamepad: case PrefixedGamepad:
return "'navigator.webkitGetGamepads' is deprecated. Please use 'navigator.getGamepads' instead."; return replacedBy("navigator.webkitGetGamepads", "navigator.getGamepads");
case PrefixedIndexedDB:
return replacedBy("webkitIndexedDB", "indexedDB");
case PrefixedIDBCursorConstructor:
return replacedBy("webkitIDBCursor", "IDBCursor");
case PrefixedIDBDatabaseConstructor:
return replacedBy("webkitIDBDatabase", "IDBDatabase");
case PrefixedIDBFactoryConstructor:
return replacedBy("webkitIDBFactory", "IDBFactory");
case PrefixedIDBIndexConstructor:
return replacedBy("webkitIDBIndex", "IDBIndex");
case PrefixedIDBKeyRangeConstructor:
return replacedBy("webkitIDBKeyRange", "IDBKeyRange");
case PrefixedIDBObjectStoreConstructor:
return replacedBy("webkitIDBObjectStore", "IDBObjectStore");
case PrefixedIDBRequestConstructor:
return replacedBy("webkitIDBRequest", "IDBRequest");
case PrefixedIDBTransactionConstructor:
return replacedBy("webkitIDBTransaction", "IDBTransaction");
case PrefixedRequestAnimationFrame: case PrefixedRequestAnimationFrame:
return "'webkitRequestAnimationFrame' is vendor-specific. Please use the standard 'requestAnimationFrame' instead."; return "'webkitRequestAnimationFrame' is vendor-specific. Please use the standard 'requestAnimationFrame' instead.";
...@@ -707,10 +740,10 @@ String UseCounter::deprecationMessage(Feature feature) ...@@ -707,10 +740,10 @@ String UseCounter::deprecationMessage(Feature feature)
return "'NodeIterator.detach' is now a no-op, as per DOM (http://dom.spec.whatwg.org/#dom-nodeiterator-detach)."; return "'NodeIterator.detach' is now a no-op, as per DOM (http://dom.spec.whatwg.org/#dom-nodeiterator-detach).";
case AttrNodeValue: case AttrNodeValue:
return "'Attr.nodeValue' is deprecated. Please use 'value' instead."; return replacedBy("Attr.nodeValue", "value");
case AttrTextContent: case AttrTextContent:
return "'Attr.textContent' is deprecated. Please use 'value' instead."; return replacedBy("Attr.textContent", "value");
case NodeIteratorExpandEntityReferences: case NodeIteratorExpandEntityReferences:
return "'NodeIterator.expandEntityReferences' is deprecated and has been removed from DOM. It always returns false."; return "'NodeIterator.expandEntityReferences' is deprecated and has been removed from DOM. It always returns false.";
......
...@@ -330,7 +330,7 @@ WebInspector.IDBDataView.prototype = { ...@@ -330,7 +330,7 @@ WebInspector.IDBDataView.prototype = {
this._pageForwardButton.disabled = !hasMore; this._pageForwardButton.disabled = !hasMore;
} }
var idbKeyRange = key ? window.webkitIDBKeyRange.lowerBound(key) : null; var idbKeyRange = key ? window.IDBKeyRange.lowerBound(key) : null;
if (this._isIndex) if (this._isIndex)
this._model.loadIndexData(this._databaseId, this._objectStore.name, this._index.name, idbKeyRange, skipCount, pageSize, callback.bind(this)); this._model.loadIndexData(this._databaseId, this._objectStore.name, this._index.name, idbKeyRange, skipCount, pageSize, callback.bind(this));
else else
...@@ -427,4 +427,3 @@ WebInspector.IDBDataGridNode.prototype = { ...@@ -427,4 +427,3 @@ WebInspector.IDBDataGridNode.prototype = {
__proto__: WebInspector.DataGridNode.prototype __proto__: WebInspector.DataGridNode.prototype
} }
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
[ [
ImplementedAs=DOMWindowIndexedDatabase, ImplementedAs=DOMWindowIndexedDatabase,
] partial interface Window { ] partial interface Window {
[ImplementedAs=indexedDB, MeasureAs=PrefixedIndexedDB] readonly attribute IDBFactory webkitIndexedDB; [ImplementedAs=indexedDB, DeprecateAs=PrefixedIndexedDB] readonly attribute IDBFactory webkitIndexedDB;
[MeasureAs=UnprefixedIndexedDB] readonly attribute IDBFactory indexedDB; [MeasureAs=UnprefixedIndexedDB] readonly attribute IDBFactory indexedDB;
[MeasureAs=PrefixedIDBCursorConstructor] attribute IDBCursorConstructor webkitIDBCursor; [DeprecateAs=PrefixedIDBCursorConstructor] attribute IDBCursorConstructor webkitIDBCursor;
[MeasureAs=PrefixedIDBDatabaseConstructor] attribute IDBDatabaseConstructor webkitIDBDatabase; [DeprecateAs=PrefixedIDBDatabaseConstructor] attribute IDBDatabaseConstructor webkitIDBDatabase;
[MeasureAs=PrefixedIDBFactoryConstructor] attribute IDBFactoryConstructor webkitIDBFactory; [DeprecateAs=PrefixedIDBFactoryConstructor] attribute IDBFactoryConstructor webkitIDBFactory;
[MeasureAs=PrefixedIDBIndexConstructor] attribute IDBIndexConstructor webkitIDBIndex; [DeprecateAs=PrefixedIDBIndexConstructor] attribute IDBIndexConstructor webkitIDBIndex;
[MeasureAs=PrefixedIDBKeyRangeConstructor] attribute IDBKeyRangeConstructor webkitIDBKeyRange; [DeprecateAs=PrefixedIDBKeyRangeConstructor] attribute IDBKeyRangeConstructor webkitIDBKeyRange;
[MeasureAs=PrefixedIDBObjectStoreConstructor] attribute IDBObjectStoreConstructor webkitIDBObjectStore; [DeprecateAs=PrefixedIDBObjectStoreConstructor] attribute IDBObjectStoreConstructor webkitIDBObjectStore;
[MeasureAs=PrefixedIDBRequestConstructor] attribute IDBRequestConstructor webkitIDBRequest; [DeprecateAs=PrefixedIDBRequestConstructor] attribute IDBRequestConstructor webkitIDBRequest;
[MeasureAs=PrefixedIDBTransactionConstructor] attribute IDBTransactionConstructor webkitIDBTransaction; [DeprecateAs=PrefixedIDBTransactionConstructor] attribute IDBTransactionConstructor webkitIDBTransaction;
}; };
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
*/ */
partial interface WorkerGlobalScope { partial interface WorkerGlobalScope {
[ImplementedAs=indexedDB] readonly attribute IDBFactory webkitIndexedDB; [ImplementedAs=indexedDB, DeprecateAs=PrefixedIndexedDB] readonly attribute IDBFactory webkitIndexedDB;
attribute IDBCursorConstructor webkitIDBCursor; [DeprecateAs=PrefixedIDBCursorConstructor] attribute IDBCursorConstructor webkitIDBCursor;
attribute IDBDatabaseConstructor webkitIDBDatabase; [DeprecateAs=PrefixedIDBDatabaseConstructor] attribute IDBDatabaseConstructor webkitIDBDatabase;
attribute IDBFactoryConstructor webkitIDBFactory; [DeprecateAs=PrefixedIDBFactoryConstructor] attribute IDBFactoryConstructor webkitIDBFactory;
attribute IDBIndexConstructor webkitIDBIndex; [DeprecateAs=PrefixedIDBIndexConstructor] attribute IDBIndexConstructor webkitIDBIndex;
attribute IDBKeyRangeConstructor webkitIDBKeyRange; [DeprecateAs=PrefixedIDBKeyRangeConstructor] attribute IDBKeyRangeConstructor webkitIDBKeyRange;
attribute IDBObjectStoreConstructor webkitIDBObjectStore; [DeprecateAs=PrefixedIDBObjectStoreConstructor] attribute IDBObjectStoreConstructor webkitIDBObjectStore;
attribute IDBRequestConstructor webkitIDBRequest; [DeprecateAs=PrefixedIDBRequestConstructor] attribute IDBRequestConstructor webkitIDBRequest;
attribute IDBTransactionConstructor webkitIDBTransaction; [DeprecateAs=PrefixedIDBTransactionConstructor] attribute IDBTransactionConstructor webkitIDBTransaction;
readonly attribute IDBFactory indexedDB; readonly attribute IDBFactory indexedDB;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment