Index: Source/core/storage/Storage.h |
diff --git a/Source/core/storage/Storage.h b/Source/core/storage/Storage.h |
index d7c4c47fb6e61c2c0e5d4924c9617f131f1c1736..341b6b3e901f645da396478406ba42d2c40ee10a 100644 |
--- a/Source/core/storage/Storage.h |
+++ b/Source/core/storage/Storage.h |
@@ -42,17 +42,18 @@ class LocalFrame; |
class Storage FINAL : public RefCountedWillBeGarbageCollectedFinalized<Storage>, public ScriptWrappable, public DOMWindowProperty { |
DEFINE_WRAPPERTYPEINFO(); |
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Storage); |
public: |
static PassRefPtrWillBeRawPtr<Storage> create(LocalFrame*, PassOwnPtrWillBeRawPtr<StorageArea>); |
virtual ~Storage(); |
- unsigned length(ExceptionState& ec) const { return m_storageArea->length(ec, m_frame); } |
- String key(unsigned index, ExceptionState& ec) const { return m_storageArea->key(index, ec, m_frame); } |
- String getItem(const String& key, ExceptionState& ec) const { return m_storageArea->getItem(key, ec, m_frame); } |
- void setItem(const String& key, const String& value, ExceptionState& ec) { m_storageArea->setItem(key, value, ec, m_frame); } |
- void removeItem(const String& key, ExceptionState& ec) { m_storageArea->removeItem(key, ec, m_frame); } |
- void clear(ExceptionState& ec) { m_storageArea->clear(ec, m_frame); } |
- bool contains(const String& key, ExceptionState& ec) const { return m_storageArea->contains(key, ec, m_frame); } |
+ unsigned length(ExceptionState& ec) const { return m_storageArea->length(ec, frame()); } |
+ String key(unsigned index, ExceptionState& ec) const { return m_storageArea->key(index, ec, frame()); } |
+ String getItem(const String& key, ExceptionState& ec) const { return m_storageArea->getItem(key, ec, frame()); } |
+ void setItem(const String& key, const String& value, ExceptionState& ec) { m_storageArea->setItem(key, value, ec, frame()); } |
+ void removeItem(const String& key, ExceptionState& ec) { m_storageArea->removeItem(key, ec, frame()); } |
+ void clear(ExceptionState& ec) { m_storageArea->clear(ec, frame()); } |
+ bool contains(const String& key, ExceptionState& ec) const { return m_storageArea->contains(key, ec, frame()); } |
StorageArea* area() const { return m_storageArea.get(); } |
@@ -65,7 +66,7 @@ public: |
void namedPropertyEnumerator(Vector<String>&, ExceptionState&); |
bool namedPropertyQuery(const AtomicString&, ExceptionState&); |
- void trace(Visitor*); |
+ virtual void trace(Visitor*) OVERRIDE; |
private: |
Storage(LocalFrame*, PassOwnPtrWillBeRawPtr<StorageArea>); |