Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Side by Side Diff: chrome/renderer/extensions/scoped_persistent.h

Issue 23636015: Remove unsafe access hacks from ScopedPersistent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: code review (jyasskin)' Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_RENDERER_EXTENSIONS_SCOPED_PERSISTENT_H_ 5 #ifndef CHROME_RENDERER_EXTENSIONS_SCOPED_PERSISTENT_H_
6 #define CHROME_RENDERER_EXTENSIONS_SCOPED_PERSISTENT_H_ 6 #define CHROME_RENDERER_EXTENSIONS_SCOPED_PERSISTENT_H_
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "v8/include/v8.h" 9 #include "v8/include/v8.h"
10 10
(...skipping 22 matching lines...) Expand all
33 reset(); 33 reset();
34 } 34 }
35 35
36 void reset() { 36 void reset() {
37 if (handle_.IsEmpty()) 37 if (handle_.IsEmpty())
38 return; 38 return;
39 handle_.Dispose(); 39 handle_.Dispose();
40 handle_.Clear(); 40 handle_.Clear();
41 } 41 }
42 42
43 v8::Handle<T> operator->() const { 43 bool IsEmpty() const {
44 return get(); 44 return handle_.IsEmpty();
45 }
46
47 // TODO(dcarney): Remove this function
48 // This is an unsafe access to the underlying handle
49 v8::Handle<T> get() const {
50 return *reinterpret_cast<v8::Handle<T>*>(
51 const_cast<v8::Persistent<T>* >(&handle_));
52 } 45 }
53 46
54 v8::Handle<T> NewHandle() const { 47 v8::Handle<T> NewHandle() const {
55 if (handle_.IsEmpty()) 48 if (handle_.IsEmpty())
56 return v8::Local<T>(); 49 return v8::Local<T>();
57 return v8::Local<T>::New(GetIsolate(handle_), handle_); 50 return v8::Local<T>::New(GetIsolate(handle_), handle_);
58 } 51 }
59 52
53 v8::Handle<T> NewHandle(v8::Isolate* isolate) const {
54 if (handle_.IsEmpty())
55 return v8::Local<T>();
56 return v8::Local<T>::New(isolate, handle_);
57 }
58
60 template<typename P> 59 template<typename P>
61 void MakeWeak(P* parameters, 60 void MakeWeak(P* parameters,
62 typename v8::WeakReferenceCallbacks<T, P>::Revivable callback) { 61 typename v8::WeakReferenceCallbacks<T, P>::Revivable callback) {
63 handle_.MakeWeak(parameters, callback); 62 handle_.MakeWeak(parameters, callback);
64 } 63 }
65 64
66 private: 65 private:
67 template <typename U> 66 template <typename U>
68 static v8::Isolate* GetIsolate(v8::Handle<U> object_handle) { 67 static v8::Isolate* GetIsolate(v8::Handle<U> object_handle) {
69 // Only works for v8::Object and its subclasses. Add specialisations for 68 // Only works for v8::Object and its subclasses. Add specialisations for
(...skipping 13 matching lines...) Expand all
83 } 82 }
84 83
85 v8::Persistent<T> handle_; 84 v8::Persistent<T> handle_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(ScopedPersistent); 86 DISALLOW_COPY_AND_ASSIGN(ScopedPersistent);
88 }; 87 };
89 88
90 } // namespace extensions 89 } // namespace extensions
91 90
92 #endif // CHROME_RENDERER_EXTENSIONS_SCOPED_PERSISTENT_H_ 91 #endif // CHROME_RENDERER_EXTENSIONS_SCOPED_PERSISTENT_H_
OLDNEW
« no previous file with comments | « chrome/renderer/extensions/render_view_observer_natives.cc ('k') | chrome/renderer/extensions/v8_schema_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698