| Index: third_party/WebKit/Source/modules/storage/StorageNamespaceController.h
|
| diff --git a/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h b/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h
|
| index 849bcb6163c501e4fbf027960adc20c6c31b3618..fa2ccc67d772aa1b2a2c736a2466d95fbba10a8f 100644
|
| --- a/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h
|
| +++ b/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h
|
| @@ -16,16 +16,15 @@ class InspectorDOMStorageAgent;
|
| class StorageClient;
|
| class StorageNamespace;
|
|
|
| -class MODULES_EXPORT StorageNamespaceController final : public NoBaseWillBeGarbageCollectedFinalized<StorageNamespaceController>, public WillBeHeapSupplement<Page> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StorageNamespaceController);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(StorageNamespaceController);
|
| +class MODULES_EXPORT StorageNamespaceController final : public GarbageCollectedFinalized<StorageNamespaceController>, public HeapSupplement<Page> {
|
| + USING_GARBAGE_COLLECTED_MIXIN(StorageNamespaceController);
|
| public:
|
| StorageNamespace* sessionStorage(bool optionalCreate = true);
|
| StorageClient* storageClient() { return m_client; }
|
| ~StorageNamespaceController();
|
|
|
| static void provideStorageNamespaceTo(Page&, StorageClient*);
|
| - static StorageNamespaceController* from(Page* page) { return static_cast<StorageNamespaceController*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
|
| + static StorageNamespaceController* from(Page* page) { return static_cast<StorageNamespaceController*>(HeapSupplement<Page>::from(page, supplementName())); }
|
|
|
| DECLARE_TRACE();
|
|
|
| @@ -36,7 +35,7 @@ private:
|
| static const char* supplementName();
|
| OwnPtr<StorageNamespace> m_sessionStorage;
|
| StorageClient* m_client;
|
| - RawPtrWillBeMember<InspectorDOMStorageAgent> m_inspectorAgent;
|
| + Member<InspectorDOMStorageAgent> m_inspectorAgent;
|
| };
|
|
|
| } // namespace blink
|
|
|