diff options
author | kalman <kalman@chromium.org> | 2015-03-12 09:40:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 16:41:00 +0000 |
commit | 83292b8f38eaf2f260996f579ad0f632cb6fccbd (patch) | |
tree | 53a7fdd98b4cb86adce68dd013ba59650820fc7a /extensions/renderer/guest_view | |
parent | 084c065d1dd79bde182b9f1ee40024a6360dc696 (diff) | |
download | chromium_src-83292b8f38eaf2f260996f579ad0f632cb6fccbd.zip chromium_src-83292b8f38eaf2f260996f579ad0f632cb6fccbd.tar.gz chromium_src-83292b8f38eaf2f260996f579ad0f632cb6fccbd.tar.bz2 |
Rename v8::UniquePersistent to v8::Global in Extensions code.
R=rockot@chromium.org
Review URL: https://codereview.chromium.org/997973002
Cr-Commit-Position: refs/heads/master@{#320302}
Diffstat (limited to 'extensions/renderer/guest_view')
3 files changed, 8 insertions, 8 deletions
diff --git a/extensions/renderer/guest_view/extensions_guest_view_container.h b/extensions/renderer/guest_view/extensions_guest_view_container.h index cd03f63..7071514 100644 --- a/extensions/renderer/guest_view/extensions_guest_view_container.h +++ b/extensions/renderer/guest_view/extensions_guest_view_container.h @@ -42,7 +42,7 @@ class ExtensionsGuestViewContainer : public GuestViewContainer { private: GuestViewContainer* container_; - v8::UniquePersistent<v8::Function> callback_; + v8::Global<v8::Function> callback_; v8::Isolate* const isolate_; }; @@ -110,10 +110,10 @@ class ExtensionsGuestViewContainer : public GuestViewContainer { std::deque<linked_ptr<Request> > pending_requests_; linked_ptr<Request> pending_response_; - v8::UniquePersistent<v8::Function> destruction_callback_; + v8::Global<v8::Function> destruction_callback_; v8::Isolate* destruction_isolate_; - v8::UniquePersistent<v8::Function> element_resize_callback_; + v8::Global<v8::Function> element_resize_callback_; v8::Isolate* element_resize_isolate_; // Weak pointer factory used for calling the element resize callback. diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc index bc7758c..e8657e6 100644 --- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc +++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc @@ -200,9 +200,9 @@ void MimeHandlerViewContainer::didFinishLoading( void MimeHandlerViewContainer::PostMessage(v8::Isolate* isolate, v8::Handle<v8::Value> message) { if (!guest_loaded_) { - linked_ptr<v8::UniquePersistent<v8::Value>> scoped_persistent( - new v8::UniquePersistent<v8::Value>(isolate, message)); - pending_messages_.push_back(scoped_persistent); + linked_ptr<v8::Global<v8::Value>> global( + new v8::Global<v8::Value>(isolate, message)); + pending_messages_.push_back(global); return; } diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h index a58ee8a..329b58b 100644 --- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h +++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h @@ -103,12 +103,12 @@ class MimeHandlerViewContainer : public GuestViewContainer, scoped_ptr<blink::WebURLLoader> loader_; // The scriptable object that backs the plugin. - v8::UniquePersistent<v8::Object> scriptable_object_; + v8::Global<v8::Object> scriptable_object_; // Pending postMessage messages that need to be sent to the guest. These are // queued while the guest is loading and once it is fully loaded they are // delivered so that messages aren't lost. - std::vector<linked_ptr<v8::UniquePersistent<v8::Value>>> pending_messages_; + std::vector<linked_ptr<v8::Global<v8::Value>>> pending_messages_; // True if the guest page has fully loaded and its JavaScript onload function // has been called. |