From 14cde41766d4f69d0f41e9fc20832af031785d6a Mon Sep 17 00:00:00 2001
From: Zach Bjornson <zbbjornson@gmail.com>
Date: Sun, 14 Oct 2018 13:34:32 -0700
Subject: [PATCH] Rename 'filter' to 'quality'

Ref #1063
---
 CHANGELOG.md                    | 8 ++++++++
 Readme.md                       | 6 +++---
 src/CanvasRenderingContext2d.cc | 6 +++---
 src/CanvasRenderingContext2d.h  | 4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9b4184fe..091950aa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,11 @@ canvas.createPNGStream() // new
 canvas.syncJPEGStream() // old
 canvas.createSyncJPEGStream() // old
 canvas.createJPEGStream() // new
+
+// (6) Context2d.filter has been renamed to context2d.quality to avoid a
+//     conflict with the new standard 'filter' property.
+context.filter = 'best' // old
+context.quality = 'best' // new
 ```
 
 ### Breaking
@@ -72,6 +77,9 @@ canvas.createJPEGStream() // new
  * See also: *Correct some of the `globalCompositeOperator` types* under
    **Fixed**. These changes were bug-fixes, but will break existing code relying
    on the incorrect types.
+ * Rename `context2d.filter` to `context2d.quality` to avoid a conflict with the
+   new standard 'filter' property. Note that the standard 'filter' property is
+   not yet implemented.
 
 ### Fixed
  * Fix build with SVG support enabled (#1123)
diff --git a/Readme.md b/Readme.md
index 3c3d76637..90d7c62cc 100644
--- a/Readme.md
+++ b/Readme.md
@@ -88,7 +88,7 @@ This project is an implementation of the Web Canvas API and implements that API
 * [Canvas#createPDFStream()](#canvascreatepdfstream)
 * [Canvas#toDataURL()](#canvastodataurl)
 * [CanvasRenderingContext2D#patternQuality](#canvasrenderingcontext2dpatternquality)
-* [CanvasRenderingContext2D#filter](#canvasrenderingcontext2dfilter)
+* [CanvasRenderingContext2D#quality](#canvasrenderingcontext2dquality)
 * [CanvasRenderingContext2D#textDrawingMode](#canvasrenderingcontext2dtextdrawingmode)
 * [CanvasRenderingContext2D#globalCompositeOperator = 'saturate'](#canvasrenderingcontext2dglobalcompositeoperator--saturate)
 * [CanvasRenderingContext2D#antialias](#canvasrenderingcontext2dantialias)
@@ -381,10 +381,10 @@ canvas.toDataURL('image/jpeg', quality, (err, jpeg) => { }) // spec-following; q
 
 Defaults to `'good'`. Affects pattern (gradient, image, etc.) rendering quality.
 
-### CanvasRenderingContext2D#filter
+### CanvasRenderingContext2D#quality
 
 > ```ts
-> context.filter: 'fast'|'good'|'best'|'nearest'|'bilinear'
+> context.quality: 'fast'|'good'|'best'|'nearest'|'bilinear'
 > ```
 
 Defaults to `'good'`. Like `patternQuality`, but applies to transformations affecting more than just patterns.
diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc
index 1a4abb4ef..3eadc30ea 100644
--- a/src/CanvasRenderingContext2d.cc
+++ b/src/CanvasRenderingContext2d.cc
@@ -171,7 +171,7 @@ Context2d::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   SetProtoAccessor(proto, Nan::New("shadowBlur").ToLocalChecked(), GetShadowBlur, SetShadowBlur, ctor);
   SetProtoAccessor(proto, Nan::New("antialias").ToLocalChecked(), GetAntiAlias, SetAntiAlias, ctor);
   SetProtoAccessor(proto, Nan::New("textDrawingMode").ToLocalChecked(), GetTextDrawingMode, SetTextDrawingMode, ctor);
-  SetProtoAccessor(proto, Nan::New("filter").ToLocalChecked(), GetFilter, SetFilter, ctor);
+  SetProtoAccessor(proto, Nan::New("quality").ToLocalChecked(), GetQuality, SetQuality, ctor);
   Nan::Set(target, Nan::New("CanvasRenderingContext2d").ToLocalChecked(), ctor->GetFunction());
 }
 
@@ -1569,7 +1569,7 @@ NAN_SETTER(Context2d::SetTextDrawingMode) {
  * Get filter.
  */
 
-NAN_GETTER(Context2d::GetFilter) {
+NAN_GETTER(Context2d::GetQuality) {
   Context2d *context = Nan::ObjectWrap::Unwrap<Context2d>(info.This());
   const char *filter;
   switch (cairo_pattern_get_filter(cairo_get_source(context->context()))) {
@@ -1586,7 +1586,7 @@ NAN_GETTER(Context2d::GetFilter) {
  * Set filter.
  */
 
-NAN_SETTER(Context2d::SetFilter) {
+NAN_SETTER(Context2d::SetQuality) {
   Nan::Utf8String str(value->ToString());
   Context2d *context = Nan::ObjectWrap::Unwrap<Context2d>(info.This());
   cairo_filter_t filter;
diff --git a/src/CanvasRenderingContext2d.h b/src/CanvasRenderingContext2d.h
index 539cf4329..f1044995d 100644
--- a/src/CanvasRenderingContext2d.h
+++ b/src/CanvasRenderingContext2d.h
@@ -133,7 +133,7 @@ class Context2d: public Nan::ObjectWrap {
     static NAN_GETTER(GetShadowBlur);
     static NAN_GETTER(GetAntiAlias);
     static NAN_GETTER(GetTextDrawingMode);
-    static NAN_GETTER(GetFilter);
+    static NAN_GETTER(GetQuality);
     static NAN_SETTER(SetPatternQuality);
     static NAN_SETTER(SetImageSmoothingEnabled);
     static NAN_SETTER(SetGlobalCompositeOperation);
@@ -149,7 +149,7 @@ class Context2d: public Nan::ObjectWrap {
     static NAN_SETTER(SetShadowBlur);
     static NAN_SETTER(SetAntiAlias);
     static NAN_SETTER(SetTextDrawingMode);
-    static NAN_SETTER(SetFilter);
+    static NAN_SETTER(SetQuality);
     inline void setContext(cairo_t *ctx) { _context = ctx; }
     inline cairo_t *context(){ return _context; }
     inline Canvas *canvas(){ return _canvas; }