Fixes after merge

Automattic · Mar 21, 2020 · bfb4f1d · bfb4f1d
1 parent ff8b503
commit bfb4f1d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/lib/image.js b/lib/image.js
@@ -17,12 +17,7 @@ const util = require('util')
 // Lazily loaded simple-get
 let get;
 
-const proto = Image.prototype
-const _getSource = proto.getSource
-const _setSource = proto.setSource
-
-delete proto.getSource
-delete proto.setSource
+const {GetSource, SetSource} = bindings;
 
 Object.defineProperty(Image.prototype, 'src', {
   /**
@@ -88,11 +83,11 @@ Image.prototype[util.inspect.custom || 'inspect'] = function(){
     + ']';
 };
 
-function getSource (img) {
-  return img._originalSource || _getSource.call(img)
+function getSource(img){
+  return img._originalSource || GetSource.call(img);
 }
 
-function setSource (img, src, origSrc) {
-  _setSource.call(img, src)
-  img._originalSource = origSrc
+function setSource(img, src, origSrc){
+  SetSource.call(img, src);
+  img._originalSource = origSrc;
 }
diff --git a/src/backend/FBDevBackend.cc b/src/backend/FBDevBackend.cc
@@ -169,21 +169,23 @@ void FBDevBackend::setFormat(cairo_format_t format)
 
 Nan::Persistent<FunctionTemplate> FBDevBackend::constructor;
 
-void FBDevBackend::Initialize(Handle<Object> target)
+void FBDevBackend::Initialize(Local<Object> target)
 {
 	Nan::HandleScope scope;
 
 	Local<FunctionTemplate> ctor = Nan::New<FunctionTemplate>(FBDevBackend::New);
 	FBDevBackend::constructor.Reset(ctor);
 	ctor->InstanceTemplate()->SetInternalFieldCount(1);
 	ctor->SetClassName(Nan::New<String>("FBDevBackend").ToLocalChecked());
-	target->Set(Nan::New<String>("FBDevBackend").ToLocalChecked(), ctor->GetFunction());
+	Nan::Set(target,
+	         Nan::New<String>("FBDevBackend").ToLocalChecked(),
+	         Nan::GetFunction(ctor).ToLocalChecked()).Check();
 }
 
 NAN_METHOD(FBDevBackend::New)
 {
 	string fbDevice = DEFAULT_DEVICE;
-	if(info[0]->IsString()) fbDevice = *String::Utf8Value(info[0].As<String>());
+	if(info[0]->IsString()) fbDevice = *Nan::Utf8String(info[0]);
 
 	FBDevBackend* backend = new FBDevBackend(fbDevice);
 

diff --git a/src/backend/FBDevBackend.h b/src/backend/FBDevBackend.h
@@ -36,7 +36,7 @@ class FBDevBackend : public Backend
     FBDevBackend(string deviceName);
 
     static Nan::Persistent<v8::FunctionTemplate> constructor;
-    static void Initialize(v8::Handle<v8::Object> target);
+    static void Initialize(v8::Local<v8::Object> target);
     static NAN_METHOD(New);
 };