diff --git a/package.json b/package.json index f13eee5..b22100d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "make test" } , "dependencies": { - "nan": "~1.1.2" + "nan": "~1.2.0" } , "devDependencies": { "express": "3.0" diff --git a/src/Canvas.cc b/src/Canvas.cc index 869bbd8..2aabf1d 100644 --- a/src/Canvas.cc +++ b/src/Canvas.cc @@ -33,7 +33,7 @@ Canvas::Initialize(Handle target) { Local ctor = NanNew(Canvas::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("Canvas")); + ctor->SetClassName(NanNew("Canvas")); // Prototype Local proto = ctor->PrototypeTemplate(); @@ -42,9 +42,9 @@ Canvas::Initialize(Handle target) { #ifdef HAVE_JPEG NODE_SET_PROTOTYPE_METHOD(ctor, "streamJPEGSync", StreamJPEGSync); #endif - proto->SetAccessor(NanSymbol("type"), GetType); - proto->SetAccessor(NanSymbol("width"), GetWidth, SetWidth); - proto->SetAccessor(NanSymbol("height"), GetHeight, SetHeight); + proto->SetAccessor(NanNew("type"), GetType); + proto->SetAccessor(NanNew("width"), GetWidth, SetWidth); + proto->SetAccessor(NanNew("height"), GetHeight, SetHeight); NanSetTemplate(proto, "PNG_NO_FILTERS", NanNew(PNG_NO_FILTERS)); NanSetTemplate(proto, "PNG_FILTER_NONE", NanNew(PNG_FILTER_NONE)); @@ -54,7 +54,7 @@ Canvas::Initialize(Handle target) { NanSetTemplate(proto, "PNG_FILTER_PAETH", NanNew(PNG_FILTER_PAETH)); NanSetTemplate(proto, "PNG_ALL_FILTERS", NanNew(PNG_ALL_FILTERS)); - target->Set(NanSymbol("Canvas"), ctor->GetFunction()); + target->Set(NanNew("Canvas"), ctor->GetFunction()); } /* diff --git a/src/CanvasGradient.cc b/src/CanvasGradient.cc index 9be3f48..9e41c58 100644 --- a/src/CanvasGradient.cc +++ b/src/CanvasGradient.cc @@ -23,11 +23,11 @@ Gradient::Initialize(Handle target) { Local ctor = NanNew(Gradient::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("CanvasGradient")); + ctor->SetClassName(NanNew("CanvasGradient")); // Prototype NODE_SET_PROTOTYPE_METHOD(ctor, "addColorStop", AddColorStop); - target->Set(NanSymbol("CanvasGradient"), ctor->GetFunction()); + target->Set(NanNew("CanvasGradient"), ctor->GetFunction()); } /* diff --git a/src/CanvasPattern.cc b/src/CanvasPattern.cc index d874bf4..38c86d7 100644 --- a/src/CanvasPattern.cc +++ b/src/CanvasPattern.cc @@ -23,13 +23,13 @@ Pattern::Initialize(Handle target) { Local ctor = NanNew(Pattern::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("CanvasPattern")); + ctor->SetClassName(NanNew("CanvasPattern")); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("CanvasPattern")); + ctor->SetClassName(NanNew("CanvasPattern")); // Prototype - target->Set(NanSymbol("CanvasPattern"), ctor->GetFunction()); + target->Set(NanNew("CanvasPattern"), ctor->GetFunction()); } /* diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc index 179593a..762e273 100644 --- a/src/CanvasRenderingContext2d.cc +++ b/src/CanvasRenderingContext2d.cc @@ -91,7 +91,7 @@ Context2d::Initialize(Handle target) { Local ctor = NanNew(Context2d::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("CanvasRenderingContext2d")); + ctor->SetClassName(NanNew("CanvasRenderingContext2d")); // Prototype Local proto = ctor->PrototypeTemplate(); @@ -136,24 +136,24 @@ Context2d::Initialize(Handle target) { NODE_SET_PROTOTYPE_METHOD(ctor, "_setStrokePattern", SetStrokePattern); NODE_SET_PROTOTYPE_METHOD(ctor, "_setTextBaseline", SetTextBaseline); NODE_SET_PROTOTYPE_METHOD(ctor, "_setTextAlignment", SetTextAlignment); - proto->SetAccessor(NanSymbol("patternQuality"), GetPatternQuality, SetPatternQuality); - proto->SetAccessor(NanSymbol("globalCompositeOperation"), GetGlobalCompositeOperation, SetGlobalCompositeOperation); - proto->SetAccessor(NanSymbol("globalAlpha"), GetGlobalAlpha, SetGlobalAlpha); - proto->SetAccessor(NanSymbol("shadowColor"), GetShadowColor, SetShadowColor); - proto->SetAccessor(NanSymbol("fillColor"), GetFillColor); - proto->SetAccessor(NanSymbol("strokeColor"), GetStrokeColor); - proto->SetAccessor(NanSymbol("miterLimit"), GetMiterLimit, SetMiterLimit); - proto->SetAccessor(NanSymbol("lineWidth"), GetLineWidth, SetLineWidth); - proto->SetAccessor(NanSymbol("lineCap"), GetLineCap, SetLineCap); - proto->SetAccessor(NanSymbol("lineJoin"), GetLineJoin, SetLineJoin); - proto->SetAccessor(NanSymbol("lineDashOffset"), GetLineDashOffset, SetLineDashOffset); - proto->SetAccessor(NanSymbol("shadowOffsetX"), GetShadowOffsetX, SetShadowOffsetX); - proto->SetAccessor(NanSymbol("shadowOffsetY"), GetShadowOffsetY, SetShadowOffsetY); - proto->SetAccessor(NanSymbol("shadowBlur"), GetShadowBlur, SetShadowBlur); - proto->SetAccessor(NanSymbol("antialias"), GetAntiAlias, SetAntiAlias); - proto->SetAccessor(NanSymbol("textDrawingMode"), GetTextDrawingMode, SetTextDrawingMode); - proto->SetAccessor(NanSymbol("filter"), GetFilter, SetFilter); - target->Set(NanSymbol("CanvasRenderingContext2d"), ctor->GetFunction()); + proto->SetAccessor(NanNew("patternQuality"), GetPatternQuality, SetPatternQuality); + proto->SetAccessor(NanNew("globalCompositeOperation"), GetGlobalCompositeOperation, SetGlobalCompositeOperation); + proto->SetAccessor(NanNew("globalAlpha"), GetGlobalAlpha, SetGlobalAlpha); + proto->SetAccessor(NanNew("shadowColor"), GetShadowColor, SetShadowColor); + proto->SetAccessor(NanNew("fillColor"), GetFillColor); + proto->SetAccessor(NanNew("strokeColor"), GetStrokeColor); + proto->SetAccessor(NanNew("miterLimit"), GetMiterLimit, SetMiterLimit); + proto->SetAccessor(NanNew("lineWidth"), GetLineWidth, SetLineWidth); + proto->SetAccessor(NanNew("lineCap"), GetLineCap, SetLineCap); + proto->SetAccessor(NanNew("lineJoin"), GetLineJoin, SetLineJoin); + proto->SetAccessor(NanNew("lineDashOffset"), GetLineDashOffset, SetLineDashOffset); + proto->SetAccessor(NanNew("shadowOffsetX"), GetShadowOffsetX, SetShadowOffsetX); + proto->SetAccessor(NanNew("shadowOffsetY"), GetShadowOffsetY, SetShadowOffsetY); + proto->SetAccessor(NanNew("shadowBlur"), GetShadowBlur, SetShadowBlur); + proto->SetAccessor(NanNew("antialias"), GetAntiAlias, SetAntiAlias); + proto->SetAccessor(NanNew("textDrawingMode"), GetTextDrawingMode, SetTextDrawingMode); + proto->SetAccessor(NanNew("filter"), GetFilter, SetFilter); + target->Set(NanNew("CanvasRenderingContext2d"), ctor->GetFunction()); } /* @@ -766,7 +766,7 @@ NAN_GETTER(Context2d::GetGlobalCompositeOperation) { #endif } - NanReturnValue(NanSymbol(op)); + NanReturnValue(NanNew(op)); } /* @@ -804,7 +804,7 @@ NAN_GETTER(Context2d::GetPatternQuality) { case CAIRO_FILTER_BILINEAR: quality = "bilinear"; break; default: quality = "good"; } - NanReturnValue(NanSymbol(quality)); + NanReturnValue(NanNew(quality)); } /* @@ -956,7 +956,7 @@ NAN_GETTER(Context2d::GetAntiAlias) { case CAIRO_ANTIALIAS_SUBPIXEL: aa = "subpixel"; break; default: aa = "default"; } - NanReturnValue(NanSymbol(aa)); + NanReturnValue(NanNew(aa)); } /* @@ -997,7 +997,7 @@ NAN_GETTER(Context2d::GetTextDrawingMode) { } else { mode = "unknown"; } - NanReturnValue(NanSymbol(mode)); + NanReturnValue(NanNew(mode)); } /* @@ -1029,7 +1029,7 @@ NAN_GETTER(Context2d::GetFilter) { case CAIRO_FILTER_BILINEAR: filter = "bilinear"; break; default: filter = "good"; } - NanReturnValue(NanSymbol(filter)); + NanReturnValue(NanNew(filter)); } /* @@ -1111,7 +1111,7 @@ NAN_GETTER(Context2d::GetLineJoin) { case CAIRO_LINE_JOIN_ROUND: join = "round"; break; default: join = "miter"; } - NanReturnValue(NanSymbol(join)); + NanReturnValue(NanNew(join)); } /* @@ -1144,7 +1144,7 @@ NAN_GETTER(Context2d::GetLineCap) { case CAIRO_LINE_CAP_SQUARE: cap = "square"; break; default: cap = "butt"; } - NanReturnValue(NanSymbol(cap)); + NanReturnValue(NanNew(cap)); } /* diff --git a/src/FontFace.cc b/src/FontFace.cc index e739a5a..89c89aa 100644 --- a/src/FontFace.cc +++ b/src/FontFace.cc @@ -33,10 +33,10 @@ FontFace::Initialize(Handle target) { Local ctor = NanNew(FontFace::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("FontFace")); + ctor->SetClassName(NanNew("FontFace")); // Prototype - target->Set(NanSymbol("FontFace"), ctor->GetFunction()); + target->Set(NanNew("FontFace"), ctor->GetFunction()); } /* diff --git a/src/Image.cc b/src/Image.cc index ff5751f..223f5d8 100644 --- a/src/Image.cc +++ b/src/Image.cc @@ -41,25 +41,25 @@ Image::Initialize(Handle target) { Local ctor = NanNew(Image::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("Image")); + ctor->SetClassName(NanNew("Image")); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("Image")); + ctor->SetClassName(NanNew("Image")); // Prototype Local proto = ctor->PrototypeTemplate(); - proto->SetAccessor(NanSymbol("source"), GetSource, SetSource); - proto->SetAccessor(NanSymbol("complete"), GetComplete); - proto->SetAccessor(NanSymbol("width"), GetWidth); - proto->SetAccessor(NanSymbol("height"), GetHeight); - proto->SetAccessor(NanSymbol("onload"), GetOnload, SetOnload); - proto->SetAccessor(NanSymbol("onerror"), GetOnerror, SetOnerror); + proto->SetAccessor(NanNew("source"), GetSource, SetSource); + proto->SetAccessor(NanNew("complete"), GetComplete); + proto->SetAccessor(NanNew("width"), GetWidth); + proto->SetAccessor(NanNew("height"), GetHeight); + proto->SetAccessor(NanNew("onload"), GetOnload, SetOnload); + proto->SetAccessor(NanNew("onerror"), GetOnerror, SetOnerror); #if CAIRO_VERSION_MINOR >= 10 - proto->SetAccessor(NanSymbol("dataMode"), GetDataMode, SetDataMode); - ctor->Set(NanSymbol("MODE_IMAGE"), NanNew(DATA_IMAGE)); - ctor->Set(NanSymbol("MODE_MIME"), NanNew(DATA_MIME)); + proto->SetAccessor(NanNew("dataMode"), GetDataMode, SetDataMode); + ctor->Set(NanNew("MODE_IMAGE"), NanNew(DATA_IMAGE)); + ctor->Set(NanNew("MODE_MIME"), NanNew(DATA_MIME)); #endif - target->Set(NanSymbol("Image"), ctor->GetFunction()); + target->Set(NanNew("Image"), ctor->GetFunction()); } /* diff --git a/src/ImageData.cc b/src/ImageData.cc index aa1a594..bbacb75 100644 --- a/src/ImageData.cc +++ b/src/ImageData.cc @@ -21,13 +21,13 @@ ImageData::Initialize(Handle target) { Local ctor = NanNew(ImageData::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("ImageData")); + ctor->SetClassName(NanNew("ImageData")); // Prototype Local proto = ctor->PrototypeTemplate(); - proto->SetAccessor(NanSymbol("width"), GetWidth); - proto->SetAccessor(NanSymbol("height"), GetHeight); - target->Set(NanSymbol("ImageData"), ctor->GetFunction()); + proto->SetAccessor(NanNew("width"), GetWidth); + proto->SetAccessor(NanNew("height"), GetHeight); + target->Set(NanNew("ImageData"), ctor->GetFunction()); } /* @@ -43,7 +43,7 @@ NAN_METHOD(ImageData::New) { PixelArray *arr = ObjectWrap::Unwrap(obj); ImageData *imageData = new ImageData(arr); - args.This()->Set(NanSymbol("data"), args[0]); + args.This()->Set(NanNew("data"), args[0]); imageData->Wrap(args.This()); NanReturnValue(args.This()); } diff --git a/src/PixelArray.cc b/src/PixelArray.cc index 949624d..5a7006c 100644 --- a/src/PixelArray.cc +++ b/src/PixelArray.cc @@ -25,12 +25,12 @@ PixelArray::Initialize(Handle target) { Local ctor = NanNew(PixelArray::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); - ctor->SetClassName(NanSymbol("CanvasPixelArray")); + ctor->SetClassName(NanNew("CanvasPixelArray")); // Prototype Local proto = ctor->InstanceTemplate(); - proto->SetAccessor(NanSymbol("length"), GetLength); - target->Set(NanSymbol("CanvasPixelArray"), ctor->GetFunction()); + proto->SetAccessor(NanNew("length"), GetLength); + target->Set(NanNew("CanvasPixelArray"), ctor->GetFunction()); } /*