| Index: chrome/renderer/extensions/scoped_persistent.h
|
| diff --git a/chrome/renderer/extensions/scoped_persistent.h b/chrome/renderer/extensions/scoped_persistent.h
|
| index f3048eb509dee0c887b96713ac1fc42d80de81ab..22cc52bbf28604b7bf2d386bb06548ce6dffa54d 100644
|
| --- a/chrome/renderer/extensions/scoped_persistent.h
|
| +++ b/chrome/renderer/extensions/scoped_persistent.h
|
| @@ -34,10 +34,7 @@ class ScopedPersistent {
|
| }
|
|
|
| void reset() {
|
| - if (handle_.IsEmpty())
|
| - return;
|
| - handle_.Dispose();
|
| - handle_.Clear();
|
| + handle_.Reset();
|
| }
|
|
|
| bool IsEmpty() const {
|
| @@ -56,10 +53,10 @@ class ScopedPersistent {
|
| return v8::Local<T>::New(isolate, handle_);
|
| }
|
|
|
| - template<typename P>
|
| - void MakeWeak(P* parameters,
|
| - typename v8::WeakReferenceCallbacks<T, P>::Revivable callback) {
|
| - handle_.MakeWeak(parameters, callback);
|
| + template <typename P>
|
| + void SetWeak(P* parameters,
|
| + typename v8::WeakCallbackData<T, P>::Callback callback) {
|
| + handle_.SetWeak(parameters, callback);
|
| }
|
|
|
| private:
|
|
|