Skip to content

Revert recent contextify changes #5782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cjihrig wants to merge 4 commits into from
Closed

Revert recent contextify changes #5782

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f74a61c
Revert "contextify: cache sandbox and context in locals"
cjihrig Mar 18, 2016
a1a080a
Revert "contextify: replace deprecated SetWeak usage"
cjihrig Mar 18, 2016
7bb5216
Revert "contextify: cleanup weak ref for sandbox"
cjihrig Mar 18, 2016
61d2bae
Revert "contextify: cleanup weak ref for global proxy"
cjihrig Mar 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "contextify: replace deprecated SetWeak usage" 
This reverts commit 95ebc74.
  • Loading branch information
@cjihrig
cjihrig committed Mar 18, 2016
commit a1a080ae7a433d09031d70532195abb6a594b0ef
8 changes: 5 additions & 3 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using v8::Uint8Array;
using v8::UnboundScript;
using v8::V8;
using v8::Value;
using v8::WeakCallbackInfo;
using v8::WeakCallbackData;


class ContextifyContext {
Expand All @@ -66,7 +66,7 @@ class ContextifyContext {
// Allocation failure or maximum call stack size reached
if (context_.IsEmpty())
return;
context_.SetWeak(this, WeakCallback, v8::WeakCallbackType::kParameter);
context_.SetWeak(this, WeakCallback<Context>);
context_.MarkIndependent();
}

Expand Down Expand Up @@ -305,8 +305,10 @@ class ContextifyContext {
}


static void WeakCallback(const WeakCallbackInfo<ContextifyContext>& data) {
template <class T>
static void WeakCallback(const WeakCallbackData<T, ContextifyContext>& data) {
ContextifyContext* context = data.GetParameter();
context->context_.ClearWeak();
delete context;
}

Expand Down