summaryrefslogtreecommitdiffstats
path: root/WebCore/storage/Storage.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-11 17:01:47 +0100
committerBen Murdoch <benm@google.com>2009-08-11 18:21:02 +0100
commit0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch)
tree2943df35f62d885c89d01063cc528dd73b480fea /WebCore/storage/Storage.cpp
parent7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff)
downloadexternal_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/storage/Storage.cpp')
-rw-r--r--WebCore/storage/Storage.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/WebCore/storage/Storage.cpp b/WebCore/storage/Storage.cpp
index e228971..d5fc065 100644
--- a/WebCore/storage/Storage.cpp
+++ b/WebCore/storage/Storage.cpp
@@ -47,6 +47,10 @@ Storage::Storage(Frame* frame, PassRefPtr<StorageArea> storageArea)
ASSERT(m_storageArea);
}
+Storage::~Storage()
+{
+}
+
unsigned Storage::length() const
{
if (!m_frame)
@@ -55,13 +59,12 @@ unsigned Storage::length() const
return m_storageArea->length();
}
-String Storage::key(unsigned index, ExceptionCode& ec) const
+String Storage::key(unsigned index) const
{
- ec = 0;
if (!m_frame)
return String();
- return m_storageArea->key(index, ec);
+ return m_storageArea->key(index);
}
String Storage::getItem(const String& key) const