[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jorlow at chromium.org
jorlow at chromium.org
Wed Dec 22 12:25:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 06be8bddb252d1eede2be17ef88c1aaf4ba8be0e
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 23 13:23:05 2010 +0000
2010-08-19 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Steve Block.
Remove IDBDatabase.description per spec changes
https://bugs.webkit.org/show_bug.cgi?id=44264
Update layout tests to match changes. One layout test is now
obsolete.
* storage/indexeddb/database-basics-expected.txt:
* storage/indexeddb/database-description-expected.txt: Removed.
* storage/indexeddb/database-description.html: Removed.
* storage/indexeddb/script-tests/database-basics.js:
(openSuccess):
* storage/indexeddb/script-tests/database-description.js: Removed.
2010-08-19 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Steve Block.
Remove IDBDatabase.description per spec changes
https://bugs.webkit.org/show_bug.cgi?id=44264
There's now no longer any way to access the description from JS.
The main premise of the manual test is now obsolete. Over time we'll
be able to add to it again. While I'm at it, I cleaned up the format
of the manual test to be easier to follow (code and usage wise).
* manual-tests/indexed-database.html:
* storage/IDBDatabase.cpp:
(WebCore::IDBDatabase::IDBDatabase):
* storage/IDBDatabase.h:
* storage/IDBDatabase.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65807 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f35fda5..d515c93 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-19 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Remove IDBDatabase.description per spec changes
+ https://bugs.webkit.org/show_bug.cgi?id=44264
+
+ Update layout tests to match changes. One layout test is now
+ obsolete.
+
+ * storage/indexeddb/database-basics-expected.txt:
+ * storage/indexeddb/database-description-expected.txt: Removed.
+ * storage/indexeddb/database-description.html: Removed.
+ * storage/indexeddb/script-tests/database-basics.js:
+ (openSuccess):
+ * storage/indexeddb/script-tests/database-description.js: Removed.
+
2010-08-23 Roland Steiner <rolandsteiner at chromium.org>
Unreviewed change to drt_expectations.txt.
diff --git a/LayoutTests/storage/indexeddb/database-basics-expected.txt b/LayoutTests/storage/indexeddb/database-basics-expected.txt
index ea869e0..75c276d 100644
--- a/LayoutTests/storage/indexeddb/database-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/database-basics-expected.txt
@@ -24,7 +24,6 @@ PASS event.target.readyState is event.target.DONE
db = event.result
PASS db.name is "name"
-PASS db.description is "description"
PASS db.version is ""
PASS db.objectStores is []
PASS db.objectStores.length is 0
diff --git a/LayoutTests/storage/indexeddb/database-description-expected.txt b/LayoutTests/storage/indexeddb/database-description-expected.txt
deleted file mode 100644
index c90d33d..0000000
--- a/LayoutTests/storage/indexeddb/database-description-expected.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Test IDBFactory.open's description parameter.
-
-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('abcd', 'first')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'abort' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
-Success event fired:
-PASS 'result' in event is true
-PASS 'code' in event is false
-PASS 'message' in event is false
-PASS 'source' in event is true
-PASS event.source != null is true
-PASS 'onsuccess' in event.target is true
-PASS 'onerror' in event.target is true
-PASS 'abort' in event.target is true
-PASS 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-PASS event.result.description is "first"
-indexedDB.open('abcd', 'second')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'abort' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
-Success event fired:
-PASS 'result' in event is true
-PASS 'code' in event is false
-PASS 'message' in event is false
-PASS 'source' in event is true
-PASS event.source != null is true
-PASS 'onsuccess' in event.target is true
-PASS 'onerror' in event.target is true
-PASS 'abort' in event.target is true
-PASS 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-PASS firstDB.description is "first"
-PASS secondDB.description is "second"
-indexedDB.open('abcd')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'abort' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
-Success event fired:
-PASS 'result' in event is true
-PASS 'code' in event is false
-PASS 'message' in event is false
-PASS 'source' in event is true
-PASS event.source != null is true
-PASS 'onsuccess' in event.target is true
-PASS 'onerror' in event.target is true
-PASS 'abort' in event.target is true
-PASS 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-PASS firstDB.description is "first"
-PASS secondDB.description is "second"
-PASS event.result.description is "second"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/indexeddb/database-description.html b/LayoutTests/storage/indexeddb/database-description.html
deleted file mode 100644
index ca6a4d6..0000000
--- a/LayoutTests/storage/indexeddb/database-description.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
-<script src="../../fast/js/resources/js-test-pre.js"></script>
-<script src="../../fast/js/resources/js-test-post-function.js"></script>
-<script src="resources/shared.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/database-description.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/storage/indexeddb/script-tests/database-basics.js b/LayoutTests/storage/indexeddb/script-tests/database-basics.js
index a317b71..a07c684 100644
--- a/LayoutTests/storage/indexeddb/script-tests/database-basics.js
+++ b/LayoutTests/storage/indexeddb/script-tests/database-basics.js
@@ -8,7 +8,6 @@ function openSuccess()
var db = evalAndLog("db = event.result");
shouldBeEqualToString("db.name", "name");
- shouldBeEqualToString("db.description", "description");
shouldBeEqualToString("db.version", "");
shouldBe("db.objectStores", "[]");
shouldBe("db.objectStores.length", "0");
diff --git a/LayoutTests/storage/indexeddb/script-tests/database-description.js b/LayoutTests/storage/indexeddb/script-tests/database-description.js
deleted file mode 100644
index bb4acba..0000000
--- a/LayoutTests/storage/indexeddb/script-tests/database-description.js
+++ /dev/null
@@ -1,56 +0,0 @@
-description("Test IDBFactory.open's description parameter.");
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
-
-function test()
-{
- shouldBeTrue("'indexedDB' in window");
- shouldBeFalse("indexedDB == null");
-
- result = evalAndLog("indexedDB.open('abcd', 'first')");
- verifyResult(result);
- result.onsuccess = firstSuccess;
- result.onerror = unexpectedErrorCallback;
-}
-
-function firstSuccess()
-{
- verifySuccessEvent(event);
- window.firstDB = event.result;
-
- shouldBeEqualToString('event.result.description', 'first');
-
- result = evalAndLog("indexedDB.open('abcd', 'second')");
- verifyResult(result);
- result.onsuccess = secondSuccess;
- result.onerror = unexpectedErrorCallback;
-}
-
-function secondSuccess()
-{
- verifySuccessEvent(event);
- window.secondDB = event.result;
-
- shouldBeEqualToString('firstDB.description', 'first');
- shouldBeEqualToString('secondDB.description', 'second');
-
- result = evalAndLog("indexedDB.open('abcd')");
- verifyResult(result);
- result.onsuccess = thirdSuccess;
- result.onerror = unexpectedErrorCallback;
-}
-
-function thirdSuccess()
-{
- verifySuccessEvent(event);
-
- shouldBeEqualToString('firstDB.description', 'first');
- shouldBeEqualToString('secondDB.description', 'second');
- shouldBeEqualToString('event.result.description', 'second');
-
- done();
-}
-
-test();
-
-var successfullyParsed = true;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 28f025a..b526408 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-19 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Remove IDBDatabase.description per spec changes
+ https://bugs.webkit.org/show_bug.cgi?id=44264
+
+ There's now no longer any way to access the description from JS.
+ The main premise of the manual test is now obsolete. Over time we'll
+ be able to add to it again. While I'm at it, I cleaned up the format
+ of the manual test to be easier to follow (code and usage wise).
+
+ * manual-tests/indexed-database.html:
+ * storage/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::IDBDatabase):
+ * storage/IDBDatabase.h:
+ * storage/IDBDatabase.idl:
+
2010-08-23 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/manual-tests/indexed-database.html b/WebCore/manual-tests/indexed-database.html
index bcc8fe4..da2a1e1 100644
--- a/WebCore/manual-tests/indexed-database.html
+++ b/WebCore/manual-tests/indexed-database.html
@@ -2,79 +2,47 @@
<body>
<p>This is a test that only applies to IndexedDB. <span id=enabled>Our test for whether you have it enabled seems to have failed.</span></p>
-<p>This page opens up a database with the name "name" and a description of "description". Result of open: <span id=result>Pending...</span></p>
+<p>Please follow these steps in order:</p>
-<p>The first time you open this page up, the message should be a success. Now, lets make it fail. Find where the associated .indexeddb file is
- for this page, replace it with something that's not a sqlite database, and make it read only to your user. Now close and re-open the browser.
- When you re-open it, you should get an internal error from the page.</p>
+<p>First, click <a href="javascript: doOpen(true)">here</a> to open an indexedDB database. Look in the proper place in your file system (the place being specific to each port) and verify a file was created. You should be able to open the file up with sqlite and examine it that way as well.</p>
-<p>Now delete all IndexedDB files (including the one you just made), restart the browser, and come back to this page. It should start up fine again.</p>
+<p>Next, close the browser, delete the file, replace it with some garbage, and make it read only to the user the browser is running as. Now click <a href="javascript: doOpen(false)">here</a>. You should get some sort of error.</p>
-<p>Now click <a href="javascript:updateDescription()">here</a>, close the browser, come back, and click <a href="javascript:readDescription()">here</a>. If everything worked well, this should be a success here: <span id=description>...</span></p>
+<p>Close the browser, delete the file you made, and click <a href="javascript: doOpen(true)">here</a>. All should be well again.</p>
-<p>That's it!</p>
+<p>Status: <span id=status>...</span></p>
<script>
- readyCount = 0;
-
- 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>";
- else {
- document.getElementById("enabled").innerHTML = "<font color=green>Your build seems to have it enabled.</font>";
-
- request = indexedDB.open("name");
- request.onsuccess = function() {
- document.getElementById("result").innerHTML = "<font color=green>Success!</font>";
- window.nameDB = event.result;
- ++readyCount;
- };
- request.onerror = function() {
- document.getElementById("result").innerHTML = "<font color=red>Error: " + event.message + ".</font>";
- };
-
- request = indexedDB.open("another", "test of the description attribute");
- request.onsuccess = function() {
- window.anotherDB = event.result;
- ++readyCount;
- };
- }
-
- function updateDescription()
- {
- if (readCount < 2) {
- alert("The page has not finished loading. Hold on a sec...");
- return;
- }
-
- indexedDB.open("name", "test of the description attribute");
- indexedDB.open("another", "xyz");
- }
-
- function readDescription()
- {
- if (readCount < 2) {
- alert("The page has not finished loading. Hold on a sec...");
- return;
- }
-
- if (window.nameDB.description != "test of the description attribute") {
- // Since we passed in nothing, the description should not be reset.
- document.getElementById("description").innerHTML = "<font color=red>Failure: (Database 'name' was this: " + window.nameDB.description + ").</font>";
- } else if (window.anotherDB.description != "test of the description attribute") {
- // But in this case we did pass something in, so it should have been reset.
- document.getElementById("description").innerHTML = "<font color=red>Failure: (Database 'another' was this: " + window.anotherDB.description + ").</font>";
- } else {
- request = indexedDB.open("another", "123");
- request.onsuccess = function() {
- // And here it should have been reset again.
- if (event.result.description != "123")
- document.getElementById("description").innerHTML = "<font color=red>Failure: (Database 'another' was this: " + event.result.description + ").</font>";
- else
- document.getElementById("description").innerHTML = "<font color=green>Success!</font>";
- };
- }
- }
+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>";
+else
+ document.getElementById("enabled").innerHTML = "<font color=green>Your build seems to have it enabled.</font>";
+
+function status(str, color)
+{
+ if (color)
+ str = "<font color='" + color + "'>" + str + "</font>";
+ document.getElementById("status").innerHTML = str;
+}
+
+function doOpen(expectSuccess)
+{
+ status("Calling open");
+ request = indexedDB.open("xyz");
+ request.onsuccess = function() {
+ if (expectSuccess)
+ status("Open successful", "green");
+ else
+ status("Open was successful...but shouldn't have been", "red");
+ };
+ request.onerror = function() {
+ if (expectSuccess)
+ status("Unexpected error: " + event.message, "red");
+ else
+ status("Expected error: " + event.message, "green");
+ };
+}
</script>
</body>
diff --git a/WebCore/storage/IDBDatabase.cpp b/WebCore/storage/IDBDatabase.cpp
index 1d88b34..78a6646 100644
--- a/WebCore/storage/IDBDatabase.cpp
+++ b/WebCore/storage/IDBDatabase.cpp
@@ -39,7 +39,6 @@ namespace WebCore {
IDBDatabase::IDBDatabase(PassRefPtr<IDBDatabaseBackendInterface> backend)
: m_backend(backend)
- , m_description(m_backend->description())
{
// We pass a reference to this object before it can be adopted.
relaxAdoptionRequirement();
diff --git a/WebCore/storage/IDBDatabase.h b/WebCore/storage/IDBDatabase.h
index 1ad3c65..0e83288 100644
--- a/WebCore/storage/IDBDatabase.h
+++ b/WebCore/storage/IDBDatabase.h
@@ -52,7 +52,6 @@ public:
// Implement the IDL
String name() const { return m_backend->name(); }
- String description() const { return m_description; }
String version() const { return m_backend->version(); }
PassRefPtr<DOMStringList> objectStores() const { return m_backend->objectStores(); }
@@ -65,8 +64,6 @@ private:
IDBDatabase(PassRefPtr<IDBDatabaseBackendInterface>);
RefPtr<IDBDatabaseBackendInterface> m_backend;
-
- String m_description;
};
} // namespace WebCore
diff --git a/WebCore/storage/IDBDatabase.idl b/WebCore/storage/IDBDatabase.idl
index 4e3f620..51bbafb 100644
--- a/WebCore/storage/IDBDatabase.idl
+++ b/WebCore/storage/IDBDatabase.idl
@@ -29,7 +29,6 @@ module storage {
Conditional=INDEXED_DATABASE
] IDBDatabase {
readonly attribute DOMString name;
- readonly attribute DOMString description;
readonly attribute DOMString version;
readonly attribute DOMStringList objectStores;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list