| Index: Source/modules/quota/WorkerNavigatorStorageQuota.h
|
| diff --git a/Source/modules/quota/WorkerNavigatorStorageQuota.h b/Source/modules/quota/WorkerNavigatorStorageQuota.h
|
| index adf955c86743c0f574c6eff9fbaec4354a4f0ca6..31d44e8d86967e408d66db6c64daebcdbccf2c44 100644
|
| --- a/Source/modules/quota/WorkerNavigatorStorageQuota.h
|
| +++ b/Source/modules/quota/WorkerNavigatorStorageQuota.h
|
| @@ -33,16 +33,24 @@
|
|
|
| #include "core/frame/DOMWindowProperty.h"
|
| #include "core/workers/WorkerNavigator.h"
|
| +#include "heap/Handle.h"
|
| +#include "modules/quota/DeprecatedStorageQuota.h"
|
| #include "platform/Supplementable.h"
|
|
|
| namespace WebCore {
|
|
|
| -class DeprecatedStorageQuota;
|
| -class WorkerNavigator;
|
| +#ifdef WorkerNavigator_IS_GARBAGE_COLLECTED
|
| +#define RefPtrWillBePersistentThenMember RefPtrWillBeMember
|
| +#else
|
| +#define RefPtrWillBePersistentThenMember RefPtrWillBePersistent
|
| +#endif
|
|
|
| class WorkerNavigatorStorageQuota FINAL : public Supplement<WorkerNavigator> {
|
| +#ifdef WorkerNavigator_IS_GARBAGE_COLLECTED
|
| + DECLARE_GC_INFO
|
| +#endif
|
| public:
|
| - virtual ~WorkerNavigatorStorageQuota();
|
| + virtual ~WorkerNavigatorStorageQuota() { }
|
| static WorkerNavigatorStorageQuota* from(WorkerNavigator*);
|
|
|
| static DeprecatedStorageQuota* webkitTemporaryStorage(WorkerNavigator*);
|
| @@ -50,14 +58,20 @@ public:
|
| DeprecatedStorageQuota* webkitTemporaryStorage() const;
|
| DeprecatedStorageQuota* webkitPersistentStorage() const;
|
|
|
| +#ifdef WorkerNavigator_IS_GARBAGE_COLLECTED
|
| + void trace(Visitor*);
|
| +#endif
|
| +
|
| private:
|
| - explicit WorkerNavigatorStorageQuota();
|
| + explicit WorkerNavigatorStorageQuota() { }
|
| static const char* supplementName();
|
|
|
| - mutable RefPtr<DeprecatedStorageQuota> m_temporaryStorage;
|
| - mutable RefPtr<DeprecatedStorageQuota> m_persistentStorage;
|
| + mutable RefPtrWillBePersistentThenMember<DeprecatedStorageQuota> m_temporaryStorage;
|
| + mutable RefPtrWillBePersistentThenMember<DeprecatedStorageQuota> m_persistentStorage;
|
| };
|
|
|
| +#undef RefPtrWillBePersistentThenMember
|
| +
|
| } // namespace WebCore
|
|
|
| #endif // WorkerNavigatorStorageQuota_h
|
|
|