| Index: third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp
|
| diff --git a/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp b/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp
|
| index 36233c571723d717e88e43ffab7a546941fa25cd..752a6c3dceac76095bf832b94d0d67d66606a7ad 100644
|
| --- a/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp
|
| +++ b/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp
|
| @@ -40,8 +40,6 @@ DOMWindowCrypto::DOMWindowCrypto(LocalDOMWindow& window)
|
| {
|
| }
|
|
|
| -DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowCrypto);
|
| -
|
| const char* DOMWindowCrypto::supplementName()
|
| {
|
| return "DOMWindowCrypto";
|
| @@ -49,10 +47,10 @@ const char* DOMWindowCrypto::supplementName()
|
|
|
| DOMWindowCrypto& DOMWindowCrypto::from(LocalDOMWindow& window)
|
| {
|
| - DOMWindowCrypto* supplement = static_cast<DOMWindowCrypto*>(WillBeHeapSupplement<LocalDOMWindow>::from(window, supplementName()));
|
| + DOMWindowCrypto* supplement = static_cast<DOMWindowCrypto*>(HeapSupplement<LocalDOMWindow>::from(window, supplementName()));
|
| if (!supplement) {
|
| supplement = new DOMWindowCrypto(window);
|
| - provideTo(window, supplementName(), adoptPtrWillBeNoop(supplement));
|
| + provideTo(window, supplementName(), (supplement));
|
| }
|
| return *supplement;
|
| }
|
| @@ -72,7 +70,7 @@ Crypto* DOMWindowCrypto::crypto() const
|
| DEFINE_TRACE(DOMWindowCrypto)
|
| {
|
| visitor->trace(m_crypto);
|
| - WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
|
| + HeapSupplement<LocalDOMWindow>::trace(visitor);
|
| DOMWindowProperty::trace(visitor);
|
| }
|
|
|
|
|