| Index: third_party/WebKit/Source/platform/MemoryPurgeController.h
|
| diff --git a/third_party/WebKit/Source/platform/MemoryPurgeController.h b/third_party/WebKit/Source/platform/MemoryPurgeController.h
|
| index af7a41009b6aafca3ecf34a391d1b86328ea57bb..4fb1595e75ef99517703f6a2cd23cd9e5c72f77e 100644
|
| --- a/third_party/WebKit/Source/platform/MemoryPurgeController.h
|
| +++ b/third_party/WebKit/Source/platform/MemoryPurgeController.h
|
| @@ -22,7 +22,7 @@ enum class DeviceKind {
|
| // interface to be informed when they should reduce memory consumption.
|
| // MemoryPurgeController assumes that subclasses of MemoryPurgeClient are
|
| // WillBes.
|
| -class PLATFORM_EXPORT MemoryPurgeClient : public WillBeGarbageCollectedMixin {
|
| +class PLATFORM_EXPORT MemoryPurgeClient : public GarbageCollectedMixin {
|
| public:
|
| virtual ~MemoryPurgeClient() { }
|
|
|
| @@ -37,15 +37,14 @@ public:
|
| // for reducing memory consumption and notifies its clients.
|
| // Since we want to control memory per tab, MemoryPurgeController is owned by
|
| // Page.
|
| -class PLATFORM_EXPORT MemoryPurgeController final : public NoBaseWillBeGarbageCollectedFinalized<MemoryPurgeController> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(MemoryPurgeController);
|
| +class PLATFORM_EXPORT MemoryPurgeController final : public GarbageCollectedFinalized<MemoryPurgeController> {
|
| WTF_MAKE_NONCOPYABLE(MemoryPurgeController);
|
| public:
|
| static void onMemoryPressure(WebMemoryPressureLevel);
|
|
|
| - static PassOwnPtrWillBeRawPtr<MemoryPurgeController> create()
|
| + static RawPtr<MemoryPurgeController> create()
|
| {
|
| - return adoptPtrWillBeNoop(new MemoryPurgeController);
|
| + return (new MemoryPurgeController);
|
| }
|
| ~MemoryPurgeController();
|
|
|
| @@ -72,7 +71,7 @@ public:
|
| private:
|
| MemoryPurgeController();
|
|
|
| - WillBeHeapHashSet<RawPtrWillBeWeakMember<MemoryPurgeClient>> m_clients;
|
| + HeapHashSet<WeakMember<MemoryPurgeClient>> m_clients;
|
| DeviceKind m_deviceKind;
|
| };
|
|
|
|
|