| Index: third_party/WebKit/Source/modules/storage/DOMWindowStorageController.cpp
|
| diff --git a/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.cpp b/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.cpp
|
| index 61c22ede9afcdd56c4c97d235a74c05b5d7037e9..0da05ee354a1cf3bf3e9b38bf0bad0b46d7cd98e 100644
|
| --- a/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.cpp
|
| +++ b/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.cpp
|
| @@ -18,12 +18,10 @@ DOMWindowStorageController::DOMWindowStorageController(Document& document)
|
| {
|
| }
|
|
|
| -DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowStorageController);
|
| -
|
| DEFINE_TRACE(DOMWindowStorageController)
|
| {
|
| visitor->trace(m_document);
|
| - WillBeHeapSupplement<Document>::trace(visitor);
|
| + HeapSupplement<Document>::trace(visitor);
|
| DOMWindowLifecycleObserver::trace(visitor);
|
| }
|
|
|
| @@ -36,10 +34,10 @@ const char* DOMWindowStorageController::supplementName()
|
| // static
|
| DOMWindowStorageController& DOMWindowStorageController::from(Document& document)
|
| {
|
| - DOMWindowStorageController* controller = static_cast<DOMWindowStorageController*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
|
| + DOMWindowStorageController* controller = static_cast<DOMWindowStorageController*>(HeapSupplement<Document>::from(document, supplementName()));
|
| if (!controller) {
|
| controller = new DOMWindowStorageController(document);
|
| - WillBeHeapSupplement<Document>::provideTo(document, supplementName(), adoptPtrWillBeNoop(controller));
|
| + HeapSupplement<Document>::provideTo(document, supplementName(), adoptPtrWillBeNoop(controller));
|
| }
|
| return *controller;
|
| }
|
|
|